Fix them (20/24)

Fix them