diff --git a/Applet/AndroidSEProvider/lib/gpapi-upgrade.jar b/Applet/AndroidSEProvider/lib/gpapi-upgrade.jar
deleted file mode 100644
index e4814bde..00000000
Binary files a/Applet/AndroidSEProvider/lib/gpapi-upgrade.jar and /dev/null differ
diff --git a/Applet/JCardSimProvider/lib/gpapi-upgrade.jar b/Applet/JCardSimProvider/lib/gpapi-upgrade.jar
deleted file mode 100644
index e4814bde..00000000
Binary files a/Applet/JCardSimProvider/lib/gpapi-upgrade.jar and /dev/null differ
diff --git a/Applet/src/com/android/javacard/keymaster/KMKeymasterApplet.java b/Applet/src/com/android/javacard/keymaster/KMKeymasterApplet.java
index 1b8f71e0..bbf9a07a 100644
--- a/Applet/src/com/android/javacard/keymaster/KMKeymasterApplet.java
+++ b/Applet/src/com/android/javacard/keymaster/KMKeymasterApplet.java
@@ -1492,7 +1492,7 @@ private boolean isEmpty(byte[] buf, short offset, short len) {
     boolean empty = true;
     short index = 0;
     while (index < len) {
-      if (buf[index] != 0) {
+      if (buf[(short) (index + offset)] != 0) {
         empty = false;
         break;
       }
diff --git a/HAL/keymaster/4.0/JavacardKeymaster4Device.cpp b/HAL/keymaster/4.0/JavacardKeymaster4Device.cpp
index 14b53eee..c843f2d3 100644
--- a/HAL/keymaster/4.0/JavacardKeymaster4Device.cpp
+++ b/HAL/keymaster/4.0/JavacardKeymaster4Device.cpp
@@ -177,7 +177,7 @@ static void clearStrongboxOprHandleEntries(const std::unique_ptr<OperationContex
         << "Secure Element reset or applet upgrade detected. Removing existing operation handles";
     auto it = operationTable.begin();
     while (it != operationTable.end()) {
-        if (it->second == OperationType::PRIVATE_OPERATION) {  // Strongbox operation
+        if (it->second == OperationType::PRIVATE_OPERATION) { // Strongbox operation
             LOG(INFO) << "operation handle: " << it->first << " is removed";
             oprCtx->clearOperationData(it->first);
             it = operationTable.erase(it);
@@ -949,8 +949,7 @@ Return<void> JavacardKeymaster4Device::begin(KeyPurpose purpose, const hidl_vec<
     errorCode = handleBeginOperation(purpose, keyBlob, inParams, authToken, outParams,
                                      operationHandle, operType);
     if (errorCode == ErrorCode::OK && isOperationHandleExists(operationHandle)) {
-        LOG(DEBUG) << "Operation handle " << operationHandle
-                   << "already exists"
+        LOG(DEBUG) << "Operation handle " << operationHandle << "already exists"
                       "in the opertion table. so aborting this opertaion.";
         // abort the operation.
         errorCode = abortOperation(operationHandle, operType);