More NSM fixes, works fine now