Fix some slight inconsistencies.