Fix many (8/19)

Fix many