Fixes to NAL-map. Refs #1283