Fix many (6/19)

Fix many