Fix a few inconsistencies