Buffer fixes + HID deactivation