nodemanager fixes