Fix them (19/24)

Fix them