Fix more references to baseurl