Fix bugs for sceneChange