Fixed node bugs