More fixes to HWID