More binhost tweaks