diff --git a/include/proxysql_macros.h b/include/proxysql_macros.h
index abe0139ba..945189b30 100644
--- a/include/proxysql_macros.h
+++ b/include/proxysql_macros.h
@@ -22,10 +22,10 @@
 
 
 // copy 1 byte
-#define CPY1(x)	*((uint8_t *)x)
+#define CPY1(x)	*((uint8_t *)(x))
 
 // copy 2 bytes
-#define CPY2(x)	*((uint16_t *)x)
+#define CPY2(x)	*((uint16_t *)(x))
 
 
 
diff --git a/lib/MySQL_Protocol.cpp b/lib/MySQL_Protocol.cpp
index 1b0e6f203..e9c2ef4da 100644
--- a/lib/MySQL_Protocol.cpp
+++ b/lib/MySQL_Protocol.cpp
@@ -1541,6 +1541,7 @@ stmt_execute_metadata_t * MySQL_Protocol::get_binds_from_pkt(void *ptr, unsigned
 		// now we create bind structures only if needed
 		if (*stmt_meta==NULL) {
 			binds=(MYSQL_BIND *)malloc(sizeof(MYSQL_BIND)*num_params);
+			memset(binds,0,sizeof(MYSQL_BIND)*num_params);
 			ret->binds=binds;
 			is_nulls=(my_bool *)malloc(sizeof(my_bool)*num_params);
 			ret->is_nulls=is_nulls;
@@ -1653,6 +1654,9 @@ stmt_execute_metadata_t * MySQL_Protocol::get_binds_from_pkt(void *ptr, unsigned
 						uint8_t l=0;
 						uint64_t len;
 						l=mysql_decode_length((unsigned char *)p, &len);
+						if (l>1) {
+							PROXY_TRACE();
+						}
 						p+=l;
 						binds[i].buffer=p;
 						p+=len;
diff --git a/lib/mysql_connection.cpp b/lib/mysql_connection.cpp
index 67406b085..028ae07f3 100644
--- a/lib/mysql_connection.cpp
+++ b/lib/mysql_connection.cpp
@@ -474,13 +474,22 @@ void MySQL_Connection::stmt_prepare_cont(short event) {
 
 void MySQL_Connection::stmt_execute_start() {
 	PROXY_TRACE();
-	mysql_stmt_bind_param(query.stmt, query.stmt_meta->binds); // FIXME : add error handling
+	int _rc=0;
+	_rc=mysql_stmt_bind_param(query.stmt, query.stmt_meta->binds); // FIXME : add error handling
+	if (_rc) {
+	  fprintf(stderr, " mysql_stmt_bind_param() failed: %s\n", mysql_stmt_error(query.stmt));
+	}
+	proxy_info("Calling mysql_stmt_execute_start, current state: %d\n", query.stmt->state);
 	async_exit_status = mysql_stmt_execute_start(&interr , query.stmt);
+	fprintf(stderr,"Current state: %d\n", query.stmt->state);
 }
 
 void MySQL_Connection::stmt_execute_cont(short event) {
 	proxy_debug(PROXY_DEBUG_MYSQL_PROTOCOL, 6,"event=%d\n", event);
+	proxy_info("Calling mysql_stmt_execute_cont, current state: %d\n", query.stmt->state);
 	async_exit_status = mysql_stmt_execute_cont(&interr , query.stmt , mysql_status(event, true));
+	//proxy_info("mysql_stmt_execute_cont , ret=%d\n", async_exit_status);
+	fprintf(stderr,"Current state: %d\n", query.stmt->state);
 }
 
 void MySQL_Connection::stmt_execute_store_result_start() {
@@ -1327,9 +1336,12 @@ void MySQL_Connection::async_free_result() {
 		mysql_free_result(query.stmt_result);
 		query.stmt_result=NULL;
 	}
+	if (query.stmt) {
+	}
 	if (mysql_result) {
 		mysql_free_result(mysql_result);
 		mysql_result=NULL;
+		mysql_stmt_free_result(query.stmt);
 	}
 	async_state_machine=ASYNC_IDLE;
 	if (MyRS) {