bug fixes related to host datastructure