Fix baseurl to prepare for merge