Fixes for new navigation