Scenes fixes