Fix a metric shit ton of stuff