Tweaks to navigation code.