Fixes to host entry handling