navi fixes