Changes to node handling for the sake of the renderer