Fixed rendering & node replacement