Fixes for proper NSM handling