Removed more node change bugs