Fix a bunch of shit