Improved retail-ness of recent NM additions.
Merge pull request #385 from TeoTwawki/mob-fixes

Improved retail-ness of recent NM additions.