A couple navigation fixes.