Small fixes to the currentScene property