More node optimizations