Fix a metric crap-ton of stuff