fix baseurl issues