Fix small inconsistencies