Tweaks to navigation generation