Fix baseurl some more?