diff --git a/programs/drift/src/instructions/user.rs b/programs/drift/src/instructions/user.rs
index a90a36ce1..d514327a3 100644
--- a/programs/drift/src/instructions/user.rs
+++ b/programs/drift/src/instructions/user.rs
@@ -4754,7 +4754,8 @@ pub struct Withdraw<'info> {
     pub drift_signer: AccountInfo<'info>,
     #[account(
         mut,
-        constraint = &spot_market_vault.mint.eq(&user_token_account.mint)
+        constraint = &spot_market_vault.mint.eq(&user_token_account.mint),
+        constraint = user_token_account.key() != spot_market_vault.key() @ ErrorCode::InvalidSpotPosition
     )]
     pub user_token_account: Box<InterfaceAccount<'info, TokenAccount>>,
     pub token_program: Interface<'info, TokenInterface>,
@@ -4961,9 +4962,10 @@ pub struct WithdrawIsolatedPerpPosition<'info> {
     )]
     /// CHECK: forced drift_signer
     pub drift_signer: AccountInfo<'info>,
-    #[account(
+   #[account(
         mut,
-        constraint = &spot_market_vault.mint.eq(&user_token_account.mint)
+        constraint = &spot_market_vault.mint.eq(&user_token_account.mint),
+        constraint = user_token_account.key() != spot_market_vault.key() @ ErrorCode::InvalidSpotPosition
     )]
     pub user_token_account: Box<InterfaceAccount<'info, TokenAccount>>,
     pub token_program: Interface<'info, TokenInterface>,
diff --git a/sdk/src/constants/spotMarkets.ts b/sdk/src/constants/spotMarkets.ts
index d5f965d39..5ecab5d3a 100644
--- a/sdk/src/constants/spotMarkets.ts
+++ b/sdk/src/constants/spotMarkets.ts
@@ -41,14 +41,13 @@ export const DevnetSpotMarkets: SpotMarketConfig[] = [
 		symbol: 'USDC',
 		marketIndex: 0,
 		poolId: 0,
-		oracle: new PublicKey('9VCioxmni2gDLv11qufWzT3RDERhQE4iY5Gf7NTfYyAV'),
-		oracleSource: OracleSource.PYTH_LAZER_STABLE_COIN,
+		oracle: new PublicKey('En8hkHLkRe9d9DraYmBTrus518BvmVH448YcvmrFM6Ce'),
+		oracleSource: OracleSource.PYTH_STABLE_COIN_PULL,
 		mint: new PublicKey('8zGuJQqwhZafTah7Uc7Z4tXRnguqkn5KLFAP8oV6PHe2'),
 		precision: new BN(10).pow(SIX),
 		precisionExp: SIX,
 		pythFeedId:
 			'0xeaa020c61cc479712813461ce153894a96a6c00b21ed0cfc2798d1f9a9e9c94a',
-		pythLazerId: 7,
 	},
 	{
 		symbol: 'SOL',
diff --git a/sdk/src/driftClient.ts b/sdk/src/driftClient.ts
index 54a6c636b..4cf2ce77c 100644
--- a/sdk/src/driftClient.ts
+++ b/sdk/src/driftClient.ts
@@ -3788,6 +3788,11 @@ export class DriftClient {
 		txParams?: TxParams,
 		updateFuel = false
 	): Promise<TransactionSignature> {
+		// Ensure the destination account is not the vault itself to prevent state inconsistency
+		const spotMarket = this.getSpotMarketAccount(marketIndex);
+		if (spotMarket.vault.equals(associatedTokenAddress)) {
+			throw Error('Destination associatedTokenAddress cannot be the same as the spot market vault');
+		}
 		const additionalSigners: Array<Signer> = [];
 
 		const withdrawIxs = await this.getWithdrawalIxs(
@@ -4371,6 +4376,12 @@ export class DriftClient {
 		subAccountId?: number,
 		txParams?: TxParams
 	): Promise<TransactionSignature> {
+		// Ensure the destination account is not the vault itself to prevent state inconsistency
+		const spotMarket = this.getSpotMarketAccount(QUOTE_SPOT_MARKET_INDEX);
+		if (spotMarket.vault.equals(userTokenAccount)) {
+			throw Error('Destination userTokenAccount cannot be the same as the spot market vault');
+		}
+
 		const instructions =
 			await this.getWithdrawFromIsolatedPerpPositionIxsBundle(
 				amount,
@@ -9466,6 +9477,7 @@ export class DriftClient {
 				remainingAccounts: remainingAccounts,
 			}
 		);
+	
 	}
 
 	public async getJupiterLiquidateSpotWithSwapIxV6({