Fixed NM bugs