More tweaks to the hostname/IP address fetching for localhost scaling