Fix compiler issue + update NavajoSportlink.launch after branch merge