Bug fixes for rendering node view