Fix many problems