Minor changes to Navi