Fix block redemption bugs