Fix lots of things