diff --git a/lib/cpp/Makefile.am b/lib/cpp/Makefile.am
index a92de3e..134325c 100644
--- a/lib/cpp/Makefile.am
+++ b/lib/cpp/Makefile.am
@@ -5,21 +5,21 @@
 
 # Define the source file for the module
 
-libthrift_sources = src/concurrency/Monitor.cc \
-                    src/concurrency/PosixThreadFactory.cc \
-                    src/concurrency/ThreadManager.cc \
-                    src/concurrency/TimerManager.cc \
-	            src/protocol/TBinaryProtocol.cc \
-                    src/transport/TBufferedTransport.cc \
-                    src/transport/TBufferedFileWriter.cc \
-                    src/transport/TBufferedRouterTransport.cc \
-                    src/transport/TFramedTransport.cc \
-                    src/transport/TMemoryBuffer.cc \
-                    src/transport/TSocket.cc \
-                    src/transport/TServerSocket.cc \
-                    src/server/TSimpleServer.cc \
-                    src/server/TThreadPoolServer.cc \
-                    src/server/TNonblockingServer.cc
+libthrift_sources = src/concurrency/Monitor.cpp \
+                    src/concurrency/PosixThreadFactory.cpp \
+                    src/concurrency/ThreadManager.cpp \
+                    src/concurrency/TimerManager.cpp \
+	            src/protocol/TBinaryProtocol.cpp \
+                    src/transport/TBufferedTransport.cpp \
+                    src/transport/TBufferedFileWriter.cpp \
+                    src/transport/TBufferedRouterTransport.cpp \
+                    src/transport/TFramedTransport.cpp \
+                    src/transport/TMemoryBuffer.cpp \
+                    src/transport/TSocket.cpp \
+                    src/transport/TServerSocket.cpp \
+                    src/server/TSimpleServer.cpp \
+                    src/server/TThreadPoolServer.cpp \
+                    src/server/TNonblockingServer.cpp
 
 libthrift_la_SOURCES = $(libthrift_sources)
 
@@ -75,7 +75,7 @@
 
 bin_PROGRAMS = concurrency_test
 
-concurrency_test_SOURCES = src/concurrency/test/Tests.cc \
+concurrency_test_SOURCES = src/concurrency/test/Tests.cpp \
                            src/concurrency/test/ThreadFactoryTests.h \
                            src/concurrency/test/ThreadManagerTests.h \
                            src/concurrency/test/TimerManagerTests.h
diff --git a/lib/cpp/src/concurrency/Monitor.cc b/lib/cpp/src/concurrency/Monitor.cpp
similarity index 100%
rename from lib/cpp/src/concurrency/Monitor.cc
rename to lib/cpp/src/concurrency/Monitor.cpp
diff --git a/lib/cpp/src/concurrency/Mutex.cc b/lib/cpp/src/concurrency/Mutex.cpp
similarity index 100%
rename from lib/cpp/src/concurrency/Mutex.cc
rename to lib/cpp/src/concurrency/Mutex.cpp
diff --git a/lib/cpp/src/concurrency/PosixThreadFactory.cc b/lib/cpp/src/concurrency/PosixThreadFactory.cpp
similarity index 100%
rename from lib/cpp/src/concurrency/PosixThreadFactory.cc
rename to lib/cpp/src/concurrency/PosixThreadFactory.cpp
diff --git a/lib/cpp/src/concurrency/ThreadManager.cc b/lib/cpp/src/concurrency/ThreadManager.cpp
similarity index 100%
rename from lib/cpp/src/concurrency/ThreadManager.cc
rename to lib/cpp/src/concurrency/ThreadManager.cpp
diff --git a/lib/cpp/src/concurrency/TimerManager.cc b/lib/cpp/src/concurrency/TimerManager.cpp
similarity index 100%
rename from lib/cpp/src/concurrency/TimerManager.cc
rename to lib/cpp/src/concurrency/TimerManager.cpp
diff --git a/lib/cpp/src/concurrency/test/Tests.cc b/lib/cpp/src/concurrency/test/Tests.cpp
similarity index 100%
rename from lib/cpp/src/concurrency/test/Tests.cc
rename to lib/cpp/src/concurrency/test/Tests.cpp
diff --git a/lib/cpp/src/protocol/TBinaryProtocol.cc b/lib/cpp/src/protocol/TBinaryProtocol.cpp
similarity index 100%
rename from lib/cpp/src/protocol/TBinaryProtocol.cc
rename to lib/cpp/src/protocol/TBinaryProtocol.cpp
diff --git a/lib/cpp/src/server/TNonblockingServer.cc b/lib/cpp/src/server/TNonblockingServer.cpp
similarity index 100%
rename from lib/cpp/src/server/TNonblockingServer.cc
rename to lib/cpp/src/server/TNonblockingServer.cpp
diff --git a/lib/cpp/src/server/TSimpleServer.cc b/lib/cpp/src/server/TSimpleServer.cpp
similarity index 100%
rename from lib/cpp/src/server/TSimpleServer.cc
rename to lib/cpp/src/server/TSimpleServer.cpp
diff --git a/lib/cpp/src/server/TThreadPoolServer.cc b/lib/cpp/src/server/TThreadPoolServer.cpp
similarity index 100%
rename from lib/cpp/src/server/TThreadPoolServer.cc
rename to lib/cpp/src/server/TThreadPoolServer.cpp
diff --git a/lib/cpp/src/transport/TBufferedFileWriter.cc b/lib/cpp/src/transport/TBufferedFileWriter.cpp
similarity index 100%
rename from lib/cpp/src/transport/TBufferedFileWriter.cc
rename to lib/cpp/src/transport/TBufferedFileWriter.cpp
diff --git a/lib/cpp/src/transport/TBufferedRouterTransport.cc b/lib/cpp/src/transport/TBufferedRouterTransport.cpp
similarity index 100%
rename from lib/cpp/src/transport/TBufferedRouterTransport.cc
rename to lib/cpp/src/transport/TBufferedRouterTransport.cpp
diff --git a/lib/cpp/src/transport/TBufferedTransport.cc b/lib/cpp/src/transport/TBufferedTransport.cpp
similarity index 100%
rename from lib/cpp/src/transport/TBufferedTransport.cc
rename to lib/cpp/src/transport/TBufferedTransport.cpp
diff --git a/lib/cpp/src/transport/TFramedTransport.cc b/lib/cpp/src/transport/TFramedTransport.cpp
similarity index 100%
rename from lib/cpp/src/transport/TFramedTransport.cc
rename to lib/cpp/src/transport/TFramedTransport.cpp
diff --git a/lib/cpp/src/transport/TMemoryBuffer.cc b/lib/cpp/src/transport/TMemoryBuffer.cpp
similarity index 100%
rename from lib/cpp/src/transport/TMemoryBuffer.cc
rename to lib/cpp/src/transport/TMemoryBuffer.cpp
diff --git a/lib/cpp/src/transport/TMemoryBuffer.h b/lib/cpp/src/transport/TMemoryBuffer.h
index 397b186..9aa3135 100644
--- a/lib/cpp/src/transport/TMemoryBuffer.h
+++ b/lib/cpp/src/transport/TMemoryBuffer.h
@@ -68,7 +68,7 @@
 
   void getBuffer(uint8_t** bufPtr, uint32_t* sz) {
     *bufPtr = buffer_;
-    *sz = bufferSize_;
+    *sz = wPos_;
   }
 
   void resetBuffer() {
diff --git a/lib/cpp/src/transport/TServerSocket.cc b/lib/cpp/src/transport/TServerSocket.cpp
similarity index 100%
rename from lib/cpp/src/transport/TServerSocket.cc
rename to lib/cpp/src/transport/TServerSocket.cpp
diff --git a/lib/cpp/src/transport/TSocket.cc b/lib/cpp/src/transport/TSocket.cpp
similarity index 100%
rename from lib/cpp/src/transport/TSocket.cc
rename to lib/cpp/src/transport/TSocket.cpp