Fix typo and inconsistencies