Fixed node issues