Fix Block/UnblockControllerPair bugs