Tiny fixes to Navigator
Fix conflicts
Fix conflicts (again)