More base url tweaks