Remove more usage of site.baseurl (broken for now)