Better handling of forced hostname