diff --git a/src/BinaryEligibilityOracleEarningPowerCalculator.sol b/src/BinaryEligibilityOracleEarningPowerCalculator.sol
index 81ca699..ba1d70e 100644
--- a/src/BinaryEligibilityOracleEarningPowerCalculator.sol
+++ b/src/BinaryEligibilityOracleEarningPowerCalculator.sol
@@ -119,6 +119,7 @@ contract BinaryEligibilityOracleEarningPowerCalculator is Ownable, IEarningPower
     _setOraclePauseGuardian(_oraclePauseGuardian);
     _setDelegateeScoreEligibilityThreshold(_delegateeScoreEligibilityThreshold);
     _setUpdateEligibilityDelay(_updateEligibilityDelay);
+    lastOracleUpdateTime = block.timestamp;
   }
 
   /// @notice Calculates the earning power for a given delegatee and staking amount.
diff --git a/src/GovernanceStaker.sol b/src/GovernanceStaker.sol
index 95ec98f..4d4370f 100644
--- a/src/GovernanceStaker.sol
+++ b/src/GovernanceStaker.sol
@@ -2,7 +2,6 @@
 pragma solidity ^0.8.23;
 
 import {DelegationSurrogate} from "src/DelegationSurrogate.sol";
-import {DelegationSurrogateVotes} from "src/DelegationSurrogateVotes.sol";
 import {INotifiableRewardReceiver} from "src/interfaces/INotifiableRewardReceiver.sol";
 import {IEarningPowerCalculator} from "src/interfaces/IEarningPowerCalculator.sol";
 import {IERC20} from "openzeppelin/token/ERC20/IERC20.sol";
@@ -772,10 +771,7 @@ abstract contract GovernanceStaker is INotifiableRewardReceiver, Multicall {
     uint256 _depositNewEarningPower,
     uint256 _totalEarningPower
   ) internal pure returns (uint256 _newTotalEarningPower) {
-    if (_depositNewEarningPower >= _depositOldEarningPower) {
-      return _totalEarningPower + (_depositNewEarningPower - _depositOldEarningPower);
-    }
-    return _totalEarningPower - (_depositOldEarningPower - _depositNewEarningPower);
+    return _totalEarningPower + _depositNewEarningPower - _depositOldEarningPower;
   }
 
   /// @notice Internal helper method which sets the admin address.
diff --git a/src/extensions/GovernanceStakerOnBehalf.sol b/src/extensions/GovernanceStakerOnBehalf.sol
index f3c2f35..844df9a 100644
--- a/src/extensions/GovernanceStakerOnBehalf.sol
+++ b/src/extensions/GovernanceStakerOnBehalf.sol
@@ -255,13 +255,14 @@ abstract contract GovernanceStakerOnBehalf is GovernanceStaker, EIP712, Nonces {
     _revertIfPastDeadline(_deadline);
     Deposit storage deposit = deposits[_depositId];
     bytes32 _claimerHash = _hashTypedDataV4(
-      keccak256(
-        abi.encode(CLAIM_REWARD_TYPEHASH, _depositId, _useNonce(deposit.claimer), _deadline)
-      )
+      keccak256(abi.encode(CLAIM_REWARD_TYPEHASH, _depositId, nonces(deposit.claimer), _deadline))
     );
     bool _isValidClaimerClaim =
       SignatureChecker.isValidSignatureNow(deposit.claimer, _claimerHash, _signature);
-    if (_isValidClaimerClaim) return _claimReward(_depositId, deposit, deposit.claimer);
+    if (_isValidClaimerClaim) {
+      _useNonce(deposit.claimer);
+      return _claimReward(_depositId, deposit, deposit.claimer);
+    }
 
     bytes32 _ownerHash = _hashTypedDataV4(
       keccak256(abi.encode(CLAIM_REWARD_TYPEHASH, _depositId, _useNonce(deposit.owner), _deadline))
diff --git a/test/GovernanceStakerOnBehalf.t.sol b/test/GovernanceStakerOnBehalf.t.sol
index f04c427..2ef56b5 100644
--- a/test/GovernanceStakerOnBehalf.t.sol
+++ b/test/GovernanceStakerOnBehalf.t.sol
@@ -1269,12 +1269,11 @@ contract ClaimRewardOnBehalf is GovernanceStakerRewardsTest {
     uint256 _depositAmount,
     uint256 _durationPercent,
     uint256 _rewardAmount,
-    address _delegatee,
     address _depositor,
     uint256 _currentNonce,
     uint256 _deadline
   ) public {
-    vm.assume(_delegatee != address(0) && _depositor != address(0) && _sender != address(0));
+    vm.assume(_depositor != address(0) && _sender != address(0));
     _claimerPrivateKey = bound(_claimerPrivateKey, 1, 100e18);
     address _claimer = vm.addr(_claimerPrivateKey);
 
@@ -1284,7 +1283,7 @@ contract ClaimRewardOnBehalf is GovernanceStakerRewardsTest {
 
     // A user deposits staking tokens
     (_depositAmount, _depositId) =
-      _boundMintAndStake(_depositor, _depositAmount, _delegatee, _claimer);
+      _boundMintAndStake(_depositor, _depositAmount, address(0x01), _claimer);
     // The contract is notified of a reward
     _mintTransferAndNotifyReward(_rewardAmount);
     // A portion of the duration passes
@@ -1307,10 +1306,12 @@ contract ClaimRewardOnBehalf is GovernanceStakerRewardsTest {
       keccak256(abi.encodePacked("\x19\x01", EIP712_DOMAIN_SEPARATOR, _message));
     bytes memory _signature = _sign(_claimerPrivateKey, _messageHash);
 
+    uint256 _oldDepositorNonce = govStaker.nonces(_depositor);
     vm.prank(_sender);
     govStaker.claimRewardOnBehalf(_depositId, _deadline, _signature);
 
     assertEq(rewardToken.balanceOf(_claimer), _earned);
+    assertEq(govStaker.nonces(_depositor), _oldDepositorNonce);
   }
 
   function testFuzz_ClaimRewardOnBehalfOfDepositor(
@@ -1319,12 +1320,11 @@ contract ClaimRewardOnBehalf is GovernanceStakerRewardsTest {
     uint256 _depositAmount,
     uint256 _durationPercent,
     uint256 _rewardAmount,
-    address _delegatee,
     address _claimer,
     uint256 _currentNonce,
     uint256 _deadline
   ) public {
-    vm.assume(_delegatee != address(0) && _claimer != address(0) && _sender != address(0));
+    vm.assume(_claimer != address(0) && _sender != address(0));
     _depositorPrivateKey = bound(_depositorPrivateKey, 1, 100e18);
     address _depositor = vm.addr(_depositorPrivateKey);
 
@@ -1334,7 +1334,7 @@ contract ClaimRewardOnBehalf is GovernanceStakerRewardsTest {
 
     // A user deposits staking tokens
     (_depositAmount, _depositId) =
-      _boundMintAndStake(_depositor, _depositAmount, _delegatee, _claimer);
+      _boundMintAndStake(_depositor, _depositAmount, address(0x01), _claimer);
     // The contract is notified of a reward
     _mintTransferAndNotifyReward(_rewardAmount);
     // A portion of the duration passes
@@ -1357,10 +1357,12 @@ contract ClaimRewardOnBehalf is GovernanceStakerRewardsTest {
       keccak256(abi.encodePacked("\x19\x01", EIP712_DOMAIN_SEPARATOR, _message));
     bytes memory _signature = _sign(_depositorPrivateKey, _messageHash);
 
+    uint256 _oldClaimerNonce = govStaker.nonces(_claimer);
     vm.prank(_sender);
     govStaker.claimRewardOnBehalf(_depositId, _deadline, _signature);
 
     assertEq(rewardToken.balanceOf(_depositor), _earned);
+    assertEq(govStaker.nonces(_claimer), _oldClaimerNonce);
   }
 
   function testFuzz_ReturnsClaimedRewardAmount(