fix hwd issues