export_block fixes.