Fixed baseurl issues