Added site.baseurl in a few places