2 files changed, 12 insertions, 4 deletions
diff --git a/qpid/cpp/bindings/qmf/ruby/qmf.rb b/qpid/cpp/bindings/qmf/ruby/qmf.rb
index fd4f09977a..ea6b16f636 100644
--- a/qpid/cpp/bindings/qmf/ruby/qmf.rb
+++ b/qpid/cpp/bindings/qmf/ruby/qmf.rb
@@ -172,7 +172,6 @@ module Qmf
           @by_hash[@map.key(a)] = by_key(@map.key(a))
           a += 1
         end
-
       end
 
       def [] (key)
diff --git a/qpid/cpp/bindings/qmf/ruby/ruby.i b/qpid/cpp/bindings/qmf/ruby/ruby.i
index 76f8a18dcf..cf69e2863a 100644
--- a/qpid/cpp/bindings/qmf/ruby/ruby.i
+++ b/qpid/cpp/bindings/qmf/ruby/ruby.i
@@ -18,7 +18,6 @@
  */
 
 %include stl.i
-%trackobjects;
 
 %module qmfengine
 
@@ -32,9 +31,19 @@
     $result = (VALUE) $1;
 }
 
+%typemap (in) uint16_t
+{
+    $1 = FIX2UINT ($input);
+}
+
+%typemap (out) uint16_t
+{
+    $result = UINT2NUM((unsigned short) $1);
+}
+
 %typemap (in) uint32_t
 {
-    $1 = FIX2UINT ((uint32_t) $input);
+    $1 = FIX2UINT ($input);
 }
 
 %typemap (out) uint32_t
@@ -48,7 +57,7 @@
 
 %typemap (in) uint64_t
 {
-    $1 = FIX2ULONG ((uint64_t) $input);
+    $1 = FIX2ULONG ($input);
 }
 
 %typemap (out) uint64_t