Fix many more issues