Fix a couple of issues with returning from pair_blocks