diff --git a/src/core/util/ProtoStream.cc b/src/core/util/ProtoStream.cc
index 10f64364..ea6f6c21 100644
--- a/src/core/util/ProtoStream.cc
+++ b/src/core/util/ProtoStream.cc
@@ -11,7 +11,7 @@ ProtoOStream::ProtoOStream(std::ostream *outfile) : m_outfile(outfile)
 
 bool ProtoOStream::writeMessage(google::protobuf::Message *m)
 {
-	m_size = htonl(m->ByteSize());
+	uint32_t m_size = htonl(m->ByteSize());
 	m_outfile->write(reinterpret_cast<char*>(&m_size), sizeof(m_size));
 
 	if (m_outfile->bad()) {
@@ -40,6 +40,7 @@ void ProtoIStream::reset()
 
 bool ProtoIStream::getNext(google::protobuf::Message *m)
 {
+	uint32_t m_size;
 	m_infile->read(reinterpret_cast<char*>(&m_size), sizeof(m_size));
 	if (!m_infile->good())
 		return false;
diff --git a/src/core/util/ProtoStream.hpp b/src/core/util/ProtoStream.hpp
index b9abea6b..c37444d5 100644
--- a/src/core/util/ProtoStream.hpp
+++ b/src/core/util/ProtoStream.hpp
@@ -34,7 +34,7 @@ namespace fail {
  */
 class ProtoOStream {
 private:
-	uint32_t m_size; // TODO: comments needed here
+	// TODO: comments needed here
 	Logger m_log;
 	std::ostream* m_outfile;
 public:
@@ -56,8 +56,7 @@ public:
  */
 class ProtoIStream {
 private:
-	uint32_t m_size; // TODO: comments needed here
-	long m_sizeOfInfile;
+	// TODO: comments needed here
 	Logger m_log;
 	std::istream *m_infile;
 public: