Bug fixes. Stubbed navigation check.