diff --git a/ts/client/src/scripts/devnet-user.ts b/ts/client/src/scripts/devnet-user.ts
index b450aad96..34972a3a7 100644
--- a/ts/client/src/scripts/devnet-user.ts
+++ b/ts/client/src/scripts/devnet-user.ts
@@ -74,6 +74,9 @@ async function main() {
     group,
     user.publicKey,
   );
+  if (!mangoAccount) {
+    throw new Error(`MangoAccount not found for user ${user.publicKey}`);
+  }
   console.log(`...created/found mangoAccount ${mangoAccount.publicKey}`);
   console.log(mangoAccount.toString(group));
 
diff --git a/ts/client/src/scripts/mb-example1-admin.ts b/ts/client/src/scripts/mb-example1-admin.ts
index 9982f787b..9feb9a19e 100644
--- a/ts/client/src/scripts/mb-example1-admin.ts
+++ b/ts/client/src/scripts/mb-example1-admin.ts
@@ -32,7 +32,7 @@ async function createGroup() {
   );
 
   const options = AnchorProvider.defaultOptions();
-  const connection = new Connection(process.env.MB_CLUSTER_URL, options);
+  const connection = new Connection(process.env.MB_CLUSTER_URL!, options);
 
   const adminWallet = new Wallet(admin);
   console.log(`Admin ${adminWallet.publicKey.toBase58()}`);
@@ -58,7 +58,7 @@ async function registerTokens() {
   );
 
   const options = AnchorProvider.defaultOptions();
-  const connection = new Connection(process.env.MB_CLUSTER_URL, options);
+  const connection = new Connection(process.env.MB_CLUSTER_URL!, options);
 
   const adminWallet = new Wallet(admin);
   console.log(`Admin ${adminWallet.publicKey.toBase58()}`);
@@ -254,7 +254,7 @@ async function registerTokens() {
 
   // log tokens/banks
   await group.reloadAll(client);
-  for (const bank of await group.banksMap.values()) {
+  for (const bank of await Array.from(group.banksMapByMint.values()).flat()) {
     console.log(`${bank.toString()}`);
   }
 }
@@ -290,14 +290,28 @@ async function createUser(userKeypair: string) {
     group,
     user.publicKey,
   );
+  if (!mangoAccount) {
+    throw new Error(`MangoAccount not found for user ${user.publicKey}`);
+  }
+
   console.log(`...created MangoAccount ${mangoAccount.publicKey.toBase58()}`);
   console.log(mangoAccount.toString(group));
 
-  await client.tokenDeposit(group, mangoAccount, 'USDC', 10);
+  await client.tokenDeposit(
+    group,
+    mangoAccount,
+    new PublicKey(MAINNET_MINTS.get('USDC')!),
+    10,
+  );
   await mangoAccount.reload(client, group);
   console.log(`...deposited 10 USDC`);
 
-  await client.tokenDeposit(group, mangoAccount, 'SOL', 1);
+  await client.tokenDeposit(
+    group,
+    mangoAccount,
+    new PublicKey(MAINNET_MINTS.get('SOL')!),
+    1,
+  );
   await mangoAccount.reload(client, group);
   console.log(`...deposited 1 SOL`);
 }