Fixes to subdomain aliases to machine IPs