MTP fixes. Getting ready for OTG