Fixes to scene navigator.