Fixed little inconsistencies