The rest of kevin's fixes for host driver

Change-Id: I76824888d679ca3659c6ea520a6fbd059f375275