Navigation command fixes