Fix a ton of stuff