Fix the MoveTo workaround, add a workaround for DirectoryPartition.Contains