Navigation fix up