Fix a ton of inconsistencies