Fix a ton more hardcoded stuff.