Fixed node manager issues