SceneControl fixes