Minor fixes to noun morph