UD-236 Fix more links