Fix lots of stuff