Assorted navigation command fixes