Fix a bunch of stuff