Fix them (7/24)

Fix them