diff --git a/v3/src/main/java/com/skyflow/vault/controller/VaultController.java b/v3/src/main/java/com/skyflow/vault/controller/VaultController.java
index 270bf98e..fc8cc278 100644
--- a/v3/src/main/java/com/skyflow/vault/controller/VaultController.java
+++ b/v3/src/main/java/com/skyflow/vault/controller/VaultController.java
@@ -48,8 +48,8 @@ public com.skyflow.vault.data.InsertResponse bulkInsert(InsertRequest insertRequ
         try {
             LogUtil.printInfoLog(InfoLogs.VALIDATE_INSERT_REQUEST.getLog());
             Validations.validateInsertRequest(insertRequest);
-            setBearerToken();
             configureInsertConcurrencyAndBatchSize(insertRequest.getValues().size());
+            setBearerToken();
             com.skyflow.generated.rest.resources.recordservice.requests.InsertRequest request = super.getBulkInsertRequestBody(insertRequest, super.getVaultConfig());
 
             response = this.processSync(request, insertRequest.getValues());
@@ -69,8 +69,8 @@ public CompletableFuture<com.skyflow.vault.data.InsertResponse> bulkInsertAsync(
         try {
             LogUtil.printInfoLog(InfoLogs.VALIDATE_INSERT_REQUEST.getLog());
             Validations.validateInsertRequest(insertRequest);
-            setBearerToken();
             configureInsertConcurrencyAndBatchSize(insertRequest.getValues().size());
+            setBearerToken();
             com.skyflow.generated.rest.resources.recordservice.requests.InsertRequest request = super.getBulkInsertRequestBody(insertRequest, super.getVaultConfig());
             List<ErrorRecord> errorRecords = Collections.synchronizedList(new ArrayList<>());
             List<CompletableFuture<com.skyflow.vault.data.InsertResponse>> futures = this.insertBatchFutures(request, errorRecords);
diff --git a/v3/src/main/java/com/skyflow/vault/data/DetokenizeResponse.java b/v3/src/main/java/com/skyflow/vault/data/DetokenizeResponse.java
index 4116c8f5..b00817db 100644
--- a/v3/src/main/java/com/skyflow/vault/data/DetokenizeResponse.java
+++ b/v3/src/main/java/com/skyflow/vault/data/DetokenizeResponse.java
@@ -5,7 +5,6 @@
 import com.google.gson.annotations.Expose;
 
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -19,7 +18,7 @@ public class DetokenizeResponse {
     private List<ErrorRecord> errors;
 
     private List<String> originalPayload;
-    private List<String> recordsToRetry;
+    private List<String> tokensToRetry;
 
     public DetokenizeResponse(List<DetokenizeResponseObject> success, List<ErrorRecord> errors) {
         this.success = success;
@@ -35,14 +34,14 @@ public DetokenizeResponse(List<DetokenizeResponseObject> success, List<ErrorReco
     }
 
     public List<String> getTokensToRetry() {
-        if (recordsToRetry == null) {
-            recordsToRetry = new ArrayList<>();
-            recordsToRetry = errors.stream()
+        if (tokensToRetry == null) {
+            tokensToRetry = new ArrayList<>();
+            tokensToRetry = errors.stream()
                     .filter(error -> (error.getCode() >= 500 && error.getCode() <= 599) && error.getCode() != 529)
                     .map(errorRecord -> originalPayload.get(errorRecord.getIndex()))
                     .collect(Collectors.toList());
         }
-        return recordsToRetry;
+        return tokensToRetry;
     }
 
     public List<DetokenizeResponseObject> getSuccess() {