diff --git a/lib/HanReader/src/DlmsReader.cpp b/lib/HanReader/src/DlmsReader.cpp
index ff089048..a6736401 100644
--- a/lib/HanReader/src/DlmsReader.cpp
+++ b/lib/HanReader/src/DlmsReader.cpp
@@ -175,6 +175,14 @@ byte* DlmsReader::getBuffer() {
     return buffer  + (3 + destinationAddressLength + sourceAddressLength + 2 + 1);
 }
 
+byte* DlmsReader::getFullBuffer() {
+    return buffer;
+}
+
+int DlmsReader::getFullBufferLength() {
+    return dataLength;
+}
+
 int DlmsReader::GetAddress(int addressPosition, byte* addressBuffer, int start, int length)
 {
     int addressBufferPos = start;
diff --git a/lib/HanReader/src/DlmsReader.h b/lib/HanReader/src/DlmsReader.h
index 17ad0d3d..bf86951f 100644
--- a/lib/HanReader/src/DlmsReader.h
+++ b/lib/HanReader/src/DlmsReader.h
@@ -20,6 +20,8 @@ class DlmsReader
     int GetRawData(byte *buffer, int start, int length);
     int getBytesRead();
     byte* getBuffer();
+    byte* getFullBuffer();
+    int getFullBufferLength();
     
   protected:
     Crc16Class Crc16;
diff --git a/lib/HanReader/src/HanReader.cpp b/lib/HanReader/src/HanReader.cpp
index 8cef346f..a31601ec 100644
--- a/lib/HanReader/src/HanReader.cpp
+++ b/lib/HanReader/src/HanReader.cpp
@@ -40,7 +40,10 @@ bool HanReader::read(byte data) {
 		if (debugger->isActive(RemoteDebug::INFO)) {
 			printI("Got valid DLMS data (%d bytes)", bytesRead);
 			if (debugger->isActive(RemoteDebug::DEBUG)) {
-				debugPrint(buffer, 0, bytesRead);
+				byte* full = reader.getFullBuffer();
+				int size = reader.getFullBufferLength();
+				printI("Full DLMS frame (%d bytes)", size);
+				debugPrint(full, 0, size);
 			}
 		}
 
diff --git a/src/entsoe/DnbCurrParser.cpp b/src/entsoe/DnbCurrParser.cpp
index c2f45bbf..7f1aef02 100644
--- a/src/entsoe/DnbCurrParser.cpp
+++ b/src/entsoe/DnbCurrParser.cpp
@@ -6,15 +6,15 @@ float DnbCurrParser::getValue() {
 }
 
 int DnbCurrParser::available() {
-
+    return 0;
 }
 
 int DnbCurrParser::read() {
-
+    return 0;
 }
 
 int DnbCurrParser::peek() {
-
+    return 0;
 }
 
 void DnbCurrParser::flush() {
diff --git a/src/entsoe/EntsoeA44Parser.cpp b/src/entsoe/EntsoeA44Parser.cpp
index 7a211e3f..c82ed277 100644
--- a/src/entsoe/EntsoeA44Parser.cpp
+++ b/src/entsoe/EntsoeA44Parser.cpp
@@ -18,15 +18,15 @@ float EntsoeA44Parser::getPoint(uint8_t position) {
 }
 
 int EntsoeA44Parser::available() {
-
+    return 0;
 }
 
 int EntsoeA44Parser::read() {
-    
+    return 0;
 }
 
 int EntsoeA44Parser::peek() {
-
+    return 0;
 }
 
 void EntsoeA44Parser::flush() {