diff --git a/CMakeLists.txt b/CMakeLists.txt
index cc976737cdce30e7b5a8a9ed433814dc9c18cfbe..aa939f41f7d6bce55fbb4229830abbe48f4b5f37 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -108,7 +108,7 @@ else()
 endif()
 
 if(CMAKE_BUILD_TYPE MATCHES Debug)
-	ADD_DEFINITIONS(-O0)
+	ADD_DEFINITIONS(-O3)
 	ADD_DEFINITIONS(-ggdb)
 	ADD_DEFINITIONS(-DDEBUG)
 	ADD_DEFINITIONS(-Wall)
diff --git a/include/transport/networkplugin.h b/include/transport/networkplugin.h
index 150f4d94ca90cb632fb1173bc37bc8c840ef9579..9173714ed5abdc843278f3a4cd6c7e64beb59972 100644
--- a/include/transport/networkplugin.h
+++ b/include/transport/networkplugin.h
@@ -234,7 +234,7 @@ class NetworkPlugin {
 		void handleChatStatePayload(const std::string &payload, Swift::ChatState::ChatStateType type);
 		void handleAttentionPayload(const std::string &payload);
 		void handleFTStartPayload(const std::string &payload);
-		void handleDataRead(const Swift::SafeByteArray&);
+		void handleDataRead(boost::shared_ptr<Swift::SafeByteArray> data);
 		void _handleConnected(bool error);
 		void handleDisconnected();
 
diff --git a/include/transport/networkpluginserver.h b/include/transport/networkpluginserver.h
index 13e3df7572e7cca79b23fddf64bb586d4934f185..0c05bcb94ae7cd82978e7b6a8bb13aa38270be25 100644
--- a/include/transport/networkpluginserver.h
+++ b/include/transport/networkpluginserver.h
@@ -76,7 +76,7 @@ class NetworkPluginServer {
 	private:
 		void handleNewClientConnection(boost::shared_ptr<Swift::Connection> c);
 		void handleSessionFinished(Backend *c);
-		void handleDataRead(Backend *c, const Swift::SafeByteArray&);
+		void handleDataRead(Backend *c, boost::shared_ptr<Swift::SafeByteArray> data);
 
 		void handleConnectedPayload(const std::string &payload);
 		void handleDisconnectedPayload(const std::string &payload);
diff --git a/src/networkplugin.cpp b/src/networkplugin.cpp
index f002072e7e5b6eedf4583faa7de8cb92a07d8c96..2aa5ce7a5667355699fc0d8ccb4754d6e8810230 100644
--- a/src/networkplugin.cpp
+++ b/src/networkplugin.cpp
@@ -454,8 +454,8 @@ void NetworkPlugin::handleChatStatePayload(const std::string &data, Swift::ChatS
 	}
 }
 
-void NetworkPlugin::handleDataRead(const Swift::SafeByteArray &data) {
-	m_data.insert(m_data.end(), data.begin(), data.end());
+void NetworkPlugin::handleDataRead(boost::shared_ptr<Swift::SafeByteArray> data) {
+	m_data.insert(m_data.end(), data->begin(), data->end());
 
 	while (m_data.size() != 0) {
 		unsigned int expected_size;
diff --git a/src/networkpluginserver.cpp b/src/networkpluginserver.cpp
index 840fcc89a5e7ec7e43b1fe8100f16d04cb6d40bc..43ce5fe2cbd7954f96062905b04ef61a0d0e59e8 100644
--- a/src/networkpluginserver.cpp
+++ b/src/networkpluginserver.cpp
@@ -601,9 +601,9 @@ void NetworkPluginServer::handleFTDataPayload(const std::string &data) {
 	LOG4CXX_INFO(logger, "handleFTDataPayload size=" << payload.data().size());
 }
 
-void NetworkPluginServer::handleDataRead(Backend *c, const Swift::SafeByteArray &data) {
+void NetworkPluginServer::handleDataRead(Backend *c, boost::shared_ptr<Swift::SafeByteArray> data) {
 	// Append data to buffer
-	c->data.insert(c->data.end(), data.begin(), data.end());
+	c->data.insert(c->data.end(), data->begin(), data->end());
 
 	// Parse data while there are some
 	while (c->data.size() != 0) {