Fixes to scene nav.