Fix some navigation problems