fixes to hostname resolution