Fix many (12/19)

Fix many