Fixes to hsotnames