More nav path ref changes