Better MTP compatibility