Activity & SceneSwitch fixes