Remove length stuff
Fixup resolve_host