Hwc compile fixes