Windows bug fixes

Some HID values were left at their OS X values