Fix some guideline inconsistencies