Fix 2 issues of navigator