Fixing URL and BASEURL