diff --git a/script/universal/MultisigBase.sol b/script/universal/MultisigBase.sol
index d945938..65e3930 100644
--- a/script/universal/MultisigBase.sol
+++ b/script/universal/MultisigBase.sol
@@ -28,10 +28,8 @@ abstract contract MultisigBase is Simulator {
         uint256 nonce = safe.nonce();
         console.log("Safe current nonce:", nonce);
 
-        if (bytes(vm.envOr("SAFE_NONCE", "")).length > 0) {
-            nonce = vm.envUint("SAFE_NONCE");
-            console.log("Creating transaction with nonce:", nonce);
-        }
+        nonce = vm.envOr("SAFE_NONCE", nonce); // allow overriding the nonce for testing
+        console.log("Creating transaction with nonce:", nonce);
 
         return safe.encodeTransactionData({
             to: address(multicall),
diff --git a/script/universal/MultisigBuilder.sol b/script/universal/MultisigBuilder.sol
index 5d45173..70a8878 100644
--- a/script/universal/MultisigBuilder.sol
+++ b/script/universal/MultisigBuilder.sol
@@ -25,12 +25,12 @@ abstract contract MultisigBuilder is MultisigBase {
     /**
      * @notice Creates the calldata
      */
-    function _buildCalls() internal virtual view returns (IMulticall3.Call3[] memory);
+    function _buildCalls() internal virtual pure returns (IMulticall3.Call3[] memory);
 
     /**
      * @notice Returns the safe address to execute the transaction from
      */
-    function _ownerSafe() internal virtual view returns (address);
+    function _ownerSafe() internal virtual pure returns (address);
 
     /**
      * -----------------------------------------------------------
diff --git a/script/universal/NestedMultisigBuilder.sol b/script/universal/NestedMultisigBuilder.sol
index 82d79aa..73084af 100644
--- a/script/universal/NestedMultisigBuilder.sol
+++ b/script/universal/NestedMultisigBuilder.sol
@@ -27,12 +27,12 @@ abstract contract NestedMultisigBuilder is MultisigBase {
     /**
      * @notice Creates the calldata
      */
-    function _buildCalls() internal virtual view returns (IMulticall3.Call3[] memory);
+    function _buildCalls() internal virtual pure returns (IMulticall3.Call3[] memory);
 
     /**
      * @notice Returns the nested safe address to execute the final transaction from
      */
-    function _ownerSafe() internal virtual view returns (address);
+    function _ownerSafe() internal virtual pure returns (address);
 
     /**
      * -----------------------------------------------------------