3 files changed, 4 insertions, 4 deletions
diff --git a/cpp/src/qpid/console/Broker.cpp b/cpp/src/qpid/console/Broker.cpp
index 53776c1a12..d2ff8f819e 100644
--- a/cpp/src/qpid/console/Broker.cpp
+++ b/cpp/src/qpid/console/Broker.cpp
@@ -72,7 +72,7 @@ void Broker::encodeHeader(Buffer& buf, uint8_t opcode, uint32_t seq) const
 {
     buf.putOctet('A');
     buf.putOctet('M');
-    buf.putOctet('3');
+    buf.putOctet('2');
     buf.putOctet(opcode);
     buf.putLong (seq);
 }
@@ -89,7 +89,7 @@ bool Broker::checkHeader(Buffer& buf, uint8_t *opcode, uint32_t *seq) const
     *opcode = buf.getOctet();
     *seq    = buf.getLong();
 
-    return h1 == 'A' && h2 == 'M' && h3 == '3';
+    return h1 == 'A' && h2 == 'M' && h3 == '2';
 }
 
 void Broker::received(qpid::client::Message& msg)
diff --git a/cpp/src/qpid/console/Schema.cpp b/cpp/src/qpid/console/Schema.cpp
index 7efdc63ef0..a3dbd91201 100644
--- a/cpp/src/qpid/console/Schema.cpp
+++ b/cpp/src/qpid/console/Schema.cpp
@@ -119,7 +119,7 @@ SchemaClass::SchemaClass(const uint8_t _kind, const ClassKey& _key, framing::Buf
     kind(_kind), key(_key)
 {
     if (kind == KIND_TABLE) {
-        uint8_t  hasSupertype = buffer.getOctet();
+        uint8_t  hasSupertype = 0; //buffer.getOctet();
         uint16_t propCount    = buffer.getShort();
         uint16_t statCount    = buffer.getShort();
         uint16_t methodCount  = buffer.getShort();
diff --git a/cpp/src/qpid/console/Value.cpp b/cpp/src/qpid/console/Value.cpp
index 799892606a..c30660f1dc 100644
--- a/cpp/src/qpid/console/Value.cpp
+++ b/cpp/src/qpid/console/Value.cpp
@@ -114,7 +114,7 @@ string MapValue::str() const
 
 MapValue::MapValue(framing::Buffer& buffer)
 {
-    value.qmfDecode(buffer);
+    value.decode(buffer);
 }