Concurrent vdi copy fixes

xs64bit backport of #1656 and #1676