minor fixes in navigation system