Fix some navigational issues