Fixing a lot of inconsistencies