Fix build
add cmhw support