Fix for host{,s}_entry