Fixed navigation related things.