More base URL tweaking