Fix a whole lot of shit