Some updates to nav, and util.