More fixes to scene nav.