diff --git a/langspec.puya.json b/langspec.puya.json
index a50bdde4..928bfc0e 100644
--- a/langspec.puya.json
+++ b/langspec.puya.json
@@ -6307,7 +6307,7 @@
       "stack_inputs": [
         {
           "name": "A",
-          "stack_type": "any",
+          "stack_type": "address_or_index",
           "doc": null
         }
       ],
diff --git a/package-lock.json b/package-lock.json
index 39b01b61..a2c50dbe 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -13504,7 +13504,7 @@
     },
     "packages/algo-ts/dist": {
       "name": "@algorandfoundation/algorand-typescript",
-      "version": "0.0.1-alpha.24",
+      "version": "0.0.1-alpha.25",
       "dev": true,
       "peerDependencies": {
         "tslib": "^2.6.2"
diff --git a/packages/algo-ts/package.json b/packages/algo-ts/package.json
index 30b14cf5..b9e9c568 100644
--- a/packages/algo-ts/package.json
+++ b/packages/algo-ts/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@algorandfoundation/algorand-typescript",
-  "version": "0.0.1-alpha.24",
+  "version": "0.0.1-alpha.25",
   "description": "This package contains definitions for the types which comprise Algorand TypeScript which can be compiled to run on the Algorand Virtual Machine using the Puya compiler.",
   "private": false,
   "main": "index.js",
diff --git a/packages/algo-ts/src/op-types.ts b/packages/algo-ts/src/op-types.ts
index 590fea6c..c26c0213 100644
--- a/packages/algo-ts/src/op-types.ts
+++ b/packages/algo-ts/src/op-types.ts
@@ -3009,13 +3009,13 @@ export type VoterParamsType = {
    * Online stake in microalgos
    * Min AVM version: 6
    */
-  voterBalance(a: uint64 | bytes): readonly [uint64, boolean]
+  voterBalance(a: Account | uint64): readonly [uint64, boolean]
 
   /**
    * Had this account opted into block payouts
    * Min AVM version: 11
    */
-  voterIncentiveEligible(a: uint64 | bytes): readonly [boolean, boolean]
+  voterIncentiveEligible(a: Account | uint64): readonly [boolean, boolean]
 }
 
 /**
diff --git a/src/awst_build/op-metadata.ts b/src/awst_build/op-metadata.ts
index 6c23fe46..886ea525 100644
--- a/src/awst_build/op-metadata.ts
+++ b/src/awst_build/op-metadata.ts
@@ -4901,7 +4901,7 @@ export const OP_METADATA: Record<string, IntrinsicOpMapping | IntrinsicOpGroupin
           {
             argNames: ['a'],
             immediateArgs: ['VoterBalance'],
-            stackArgs: [{ name: 'a', ptypes: [ptypes.uint64PType, ptypes.bytesPType] }],
+            stackArgs: [{ name: 'a', ptypes: [ptypes.accountPType, ptypes.uint64PType] }],
             returnType: new ptypes.TuplePType({ items: [ptypes.uint64PType, ptypes.boolPType] }),
           },
         ],
@@ -4913,7 +4913,7 @@ export const OP_METADATA: Record<string, IntrinsicOpMapping | IntrinsicOpGroupin
           {
             argNames: ['a'],
             immediateArgs: ['VoterIncentiveEligible'],
-            stackArgs: [{ name: 'a', ptypes: [ptypes.uint64PType, ptypes.bytesPType] }],
+            stackArgs: [{ name: 'a', ptypes: [ptypes.accountPType, ptypes.uint64PType] }],
             returnType: new ptypes.TuplePType({ items: [ptypes.boolPType, ptypes.boolPType] }),
           },
         ],
diff --git a/src/cli.ts b/src/cli.ts
index 537298a1..e3b79164 100644
--- a/src/cli.ts
+++ b/src/cli.ts
@@ -93,7 +93,7 @@ function cli() {
         .choices(['0', '1', '2'])
         .default(defaultPuyaOptions.optimizationLevel),
     )
-    .addOption(new Option('--target-avm-version [version]', '').choices(['10']).default(10))
+    .addOption(new Option('--target-avm-version [version]', '').choices(['10', '11']).default(10))
     .addOption(
       new Option(
         '--cli-template-definitions <...definitions>',