fix hwc defs