Actually fix everything