Some fixes to the baseurl setup