Minor cleanup of code to enable access from the host
get updates from head and merge