Fix many things