Navigation, minor fixes