More inflection fixes