Even more baseurl fixes