diff --git a/panda/src/express/multiplexStream.h b/panda/src/express/multiplexStream.h
index f4e952b18f..5f2c21a6be 100644
--- a/panda/src/express/multiplexStream.h
+++ b/panda/src/express/multiplexStream.h
@@ -21,7 +21,7 @@
 //               thing to set Notify to refer to when running in batch
 //               mode.
 ////////////////////////////////////////////////////////////////////
-class EXPCL_PANDA MultiplexStream : public ostream {
+class EXPCL_PANDAEXPRESS MultiplexStream : public ostream {
 PUBLISHED:
   INLINE MultiplexStream();
 
diff --git a/panda/src/express/multiplexStreamBuf.cxx b/panda/src/express/multiplexStreamBuf.cxx
index 820c0c95ee..d596b6e447 100644
--- a/panda/src/express/multiplexStreamBuf.cxx
+++ b/panda/src/express/multiplexStreamBuf.cxx
@@ -42,8 +42,10 @@ static char test[1024];
 ////////////////////////////////////////////////////////////////////
 MultiplexStreamBuf::
 MultiplexStreamBuf() {
+#ifndef WIN32_VC
   allocate();
   setp(base(), ebuf());
+#endif
 }
 
 ////////////////////////////////////////////////////////////////////
diff --git a/panda/src/express/multiplexStreamBuf.h b/panda/src/express/multiplexStreamBuf.h
index 1ba527506b..5b97a17461 100644
--- a/panda/src/express/multiplexStreamBuf.h
+++ b/panda/src/express/multiplexStreamBuf.h
@@ -16,7 +16,7 @@
 //               sends what is written to it to any number of
 //               additional sources, like other ostreams.
 ////////////////////////////////////////////////////////////////////
-class EXPCL_PANDA MultiplexStreamBuf : public streambuf {
+class EXPCL_PANDAEXPRESS MultiplexStreamBuf : public streambuf {
 public:
   MultiplexStreamBuf();
   virtual ~MultiplexStreamBuf();