Fixed context issues with NodeManager