diff --git a/src/sa/internal/sa_interface_inmemory.template.c b/src/sa/internal/sa_interface_inmemory.template.c
index 0f17bded..dbc17825 100644
--- a/src/sa/internal/sa_interface_inmemory.template.c
+++ b/src/sa/internal/sa_interface_inmemory.template.c
@@ -1365,6 +1365,11 @@ static int32_t sa_create(void)
         // Verify data
         status = sa_verify_data(temp_sa);
 
+        if (status == CRYPTO_LIB_SUCCESS)
+        {
+            sa[spi] = *temp_sa;
+        }
+
 #ifdef PDU_DEBUG
         Crypto_saPrint(&sa[spi]);
 #endif
diff --git a/support/scripts/build_ep.sh b/support/scripts/build_ep.sh
old mode 100644
new mode 100755
diff --git a/support/scripts/update_env.sh b/support/scripts/update_env.sh
old mode 100644
new mode 100755