Fix some aspects of noun morph