Fix navigational issues