Make sure we harvest the keys of the hosts.
Addressed comments.