Add binary host
Minor fixes