Fix them (17/24)

Fix them