Fix baseurl issues