bsu and nodemanager fixes