navigator fixes