A few Codenav fixes