Small modifications to host identification