Fixed a few inconsistencies