current_scene fixes