Fix HWA mumbo jumbo