Fix put on scene / remove from scene issues with root node