Fix them (18/24)

Fix them