Better host detection