Fix some issues with scene transitions