Fix a lot of inconsistencies