Add fixes on USB protocol