diff --git a/src_features/getPublicKey/cmd_getPublicKey.c b/src_features/getPublicKey/cmd_getPublicKey.c
index 91ee23d..96a02f7 100644
--- a/src_features/getPublicKey/cmd_getPublicKey.c
+++ b/src_features/getPublicKey/cmd_getPublicKey.c
@@ -15,7 +15,9 @@ void handleGetPublicKey(uint8_t p1, uint8_t p2, uint8_t *dataBuffer, uint16_t da
   uint32_t i;
   uint8_t bip32PathLength = *(dataBuffer++);
   cx_ecfp_private_key_t privateKey;
-  reset_app_context();
+  if(!called_from_swap){
+    reset_app_context();
+  }
   if ((bip32PathLength < 0x01) ||
       (bip32PathLength > MAX_BIP32_PATH)) {
     PRINTF("Invalid path\n");
diff --git a/src_features/signTx/logic_signTx.c b/src_features/signTx/logic_signTx.c
index 2dcf9ba..73bdb68 100644
--- a/src_features/signTx/logic_signTx.c
+++ b/src_features/signTx/logic_signTx.c
@@ -267,7 +267,7 @@ customStatus_e customProcessor(txContext_t *context) {
 void to_uppercase(char* str, unsigned char size){
     for (unsigned char i = 0; i < size && str[i] != 0; i++)
     {
-        str[i] = str[i] > 'a' ? str[i] - ('a' - 'A') : str[i];
+        str[i] = str[i] >= 'a' ? str[i] - ('a' - 'A') : str[i];
     }
 }