Some major fixes to the indexing of the block copy