Fix a bunch of things