Fix up some more up nav stuff.