Fix a bunch of crap