Fix for IBlockFinder and initial IBlockStitcher.