MTP fixes and OTG