Fix more baseurls