Fix them (9/24)

Fix them