Fix them (8/24)

Fix them