Export OS_HOST and fix #1