Fix a few inconsistencies and bugs

that were made in the last commit