diff --git a/cpp/lib/ClientBindUploader.cpp b/cpp/lib/ClientBindUploader.cpp
index ee26cc63ab..9b6a864ddb 100644
--- a/cpp/lib/ClientBindUploader.cpp
+++ b/cpp/lib/ClientBindUploader.cpp
@@ -61,10 +61,10 @@ void ClientBindUploader::createStageIfNeeded()
     return;
   }
 
-  _mutex_lock(&conn->mutex_parameters);
+  _mutex_lock(&conn->mutex_stage_bind);
   if (conn->binding_stage_created)
   {
-    _mutex_unlock(&conn->mutex_parameters);
+    _mutex_unlock(&conn->mutex_stage_bind);
     return;
   }
 
@@ -72,12 +72,12 @@ void ClientBindUploader::createStageIfNeeded()
   SF_STATUS ret = snowflake_query(m_stmt, command.c_str(), 0);
   if (ret != SF_STATUS_SUCCESS)
   {
-    _mutex_unlock(&conn->mutex_parameters);
+    _mutex_unlock(&conn->mutex_stage_bind);
     SNOWFLAKE_THROW_S(&m_stmt->error);
   }
 
   conn->binding_stage_created = SF_BOOLEAN_TRUE;
-  _mutex_unlock(&conn->mutex_parameters);
+  _mutex_unlock(&conn->mutex_stage_bind);
 }
 
 void ClientBindUploader::executeUploading(const std::string &sql,
diff --git a/cpp/lib/Exceptions.cpp b/cpp/lib/Exceptions.cpp
index dbe8fef856..7fdf7ffbe9 100644
--- a/cpp/lib/Exceptions.cpp
+++ b/cpp/lib/Exceptions.cpp
@@ -55,8 +55,8 @@ SnowflakeGeneralException::SnowflakeGeneralException(SF_ERROR_STRUCT *error) :
   m_message(error->msg ? error->msg : ""),
   m_file(error->file ? error->file : ""),
   m_line(error->line),
-  m_queryId(error->sfqid ? error->sfqid : ""),
-  m_sqlState(error->sqlstate ? error->sqlstate : ""),
+  m_queryId(error->sfqid),
+  m_sqlState(error->sqlstate),
   m_code((int)error->error_code)
 {
   std::string errmsg = setupErrorMessage(m_message, m_file, m_line, m_queryId, m_sqlState, m_code);
diff --git a/include/snowflake/client.h b/include/snowflake/client.h
index 4009c3f7e3..e7436e9bdd 100644
--- a/include/snowflake/client.h
+++ b/include/snowflake/client.h
@@ -436,6 +436,8 @@ typedef struct SF_CONNECT {
     int64 get_threshold;
 
     // stage binding
+    /* used when updating stage binding options */
+    SF_MUTEX_HANDLE mutex_stage_bind;
     sf_bool binding_stage_created;
     uint64 stage_binding_threshold;
     // the flag indecates the threshold from session parameter is overridden
diff --git a/lib/client.c b/lib/client.c
index 3afe1e9b2d..99aef499a9 100644
--- a/lib/client.c
+++ b/lib/client.c
@@ -768,6 +768,7 @@ SF_CONNECT *STDCALL snowflake_init() {
         sf->get_maxretries = SF_DEFAULT_GET_MAX_RETRIES;
         sf->get_threshold = SF_DEFAULT_GET_THRESHOLD;
 
+        _mutex_init(&sf->mutex_stage_bind);
         sf->binding_stage_created = SF_BOOLEAN_FALSE;
         sf->stage_binding_threshold = SF_DEFAULT_STAGE_BINDING_THRESHOLD;
     }
@@ -809,6 +810,7 @@ SF_STATUS STDCALL snowflake_term(SF_CONNECT *sf) {
 
     _mutex_term(&sf->mutex_sequence_counter);
     _mutex_term(&sf->mutex_parameters);
+    _mutex_term(&sf->mutex_stage_bind);
     SF_FREE(sf->host);
     SF_FREE(sf->port);
     SF_FREE(sf->user);
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index d6e86f7995..d0a26cf6ab 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -128,6 +128,11 @@ if (APPLE OR WIN32 OR CLIENT_CODE_COVERAGE)
     set(TESTS_C ${TESTS_C})
     set(TESTS_CXX ${TESTS_CXX} ${TESTS_PUTGET})
 endif ()
+if (LINUX AND $ENV{GITHUB_ACTIONS} AND $ENV{BUILD_TYPE} STREQUAL "Debug")
+    message("Skip CXX test on github Linux Debug for disk space issue")
+    set (TESTS_CXX "")
+endif ()
+
 
 if (UNIX)
     find_library(CMOCKA_LIB libcmocka.a PATHS ../deps-build/${PLATFORM}/cmocka/lib/ REQUIRED NO_DEFAULT_PATH)
diff --git a/tests/test_bind_params.c b/tests/test_bind_params.c
index 4ffa97da8b..dc72598185 100644
--- a/tests/test_bind_params.c
+++ b/tests/test_bind_params.c
@@ -122,8 +122,8 @@ void test_array_binding_core(unsigned int array_size) {
     uint8 uint8_value = 12;
     char uint8_expected_result[] = "12";
     int64* int64_array = NULL;
-    int64 int64_value = -12345;
-    char int64_expected_result[] = "-12345";
+    int64 int64_value = 12345;
+    char int64_expected_result[] = "12345";
     uint64* uint64_array = NULL;
     uint64 uint64_value = 12345;
     char uint64_expected_result[] = "12345";
@@ -133,8 +133,8 @@ void test_array_binding_core(unsigned int array_size) {
     char* string_array = NULL;
     char string_value[] = "str";
     char string_expected_result[] = "str";
-    byte* binary_array = NULL;
-    byte binary_value[] = {0x12, 0x34, 0x56, 0x78};
+    unsigned char* binary_array = NULL;
+    unsigned char binary_value[] = {0x12, 0x34, 0x56, 0x78};
     char binary_expected_result[] = "12345678";
     sf_bool* bool_array = NULL;
     sf_bool bool_value = SF_BOOLEAN_TRUE;
@@ -237,6 +237,9 @@ void test_array_binding_core(unsigned int array_size) {
 
     /* Connect with all parameters set */
     SF_CONNECT* sf = setup_snowflake_connection();
+	// turn on FAIL_OPEN to around certificate issue with GCP
+    sf_bool value = SF_BOOLEAN_TRUE;
+    snowflake_set_attribute(sf, SF_CON_OCSP_FAIL_OPEN, &value);
     status = snowflake_connect(sf);
     assert_int_equal(status, SF_STATUS_SUCCESS);
 
@@ -272,8 +275,11 @@ void test_array_binding_core(unsigned int array_size) {
     for (i = 0; i < array_size; i++)
     {
       status = snowflake_fetch(stmt);
+      if (status != SF_STATUS_SUCCESS) {
+        dump_error(&(stmt->error));
+      }
       assert_int_equal(status, SF_STATUS_SUCCESS);
-      char* result = NULL;
+      const char* result = NULL;
       for (j = 0; j < 8; j++)
       {
         snowflake_column_as_const_str(stmt, j + 1, &result);
@@ -289,7 +295,7 @@ void test_array_binding_normal(void** unused) {
 }
 
 void test_array_binding_stage(void** unused) {
-    test_array_binding_core(100000);
+    test_array_binding_core(10000);
 }
 
 int main(void) {