Attempt to populate site_url from http_host, and minor tweak/fix