Fixed issues with missing blocks from initial export