Fix them (12/24)

Fix them