more fixes for mtp