Minor update to Navigator