Fix errors in nav handlers