diff --git a/Packets/PacketType.hh b/Packets/PacketType.hh
index e01db8748c2f1688360db3313cd624f48c2aea71..06c2a515698d4c193a21ed06af890d7119d94c57 100644
--- a/Packets/PacketType.hh
+++ b/Packets/PacketType.hh
@@ -222,8 +222,8 @@ namespace senf {
         \code
         // Here 'SomeRegistryTag' is optional
         struct SimplePacketType 
-            : public senf::PacketTypeBase
-              public senf:PacketTypeMixin<SimplePacketType, SomeRegistryTag>
+            : public senf::PacketTypeBase,
+              public senf::PacketTypeMixin<SimplePacketType, SomeRegistryTag>
         {
             typedef senf::PacketTypeMixin<SimplePacketType, SomeRegistryTag> mixin;
             typedef senf::ConcretePacket<SimplePacketType> packet;
@@ -292,8 +292,8 @@ namespace senf {
 
         \code
         struct SimplePacketType 
-            : public senf::PacketTypeBase
-              public senf:PacketTypeMixin<SimplePacketType, SomeRegistryTag>
+            : public senf::PacketTypeBase,
+              public senf::PacketTypeMixin<SimplePacketType, SomeRegistryTag>
         {
             typedef senf::PacketTypeMixin<SimplePacketType, SomeRegistryTag> mixin;
             typedef senf::ConcretePacket<SimplePacketType> packet;
diff --git a/Packets/ParseVariant.hh b/Packets/ParseVariant.hh
index e8593b57f92f66ba03fa997ccb9fc7f5da97f079..9deb622679e990f0dda5ba6c37afb81957bf0185 100644
--- a/Packets/ParseVariant.hh
+++ b/Packets/ParseVariant.hh
@@ -180,15 +180,15 @@ namespace senf {
                                             (senf::Parse_UInt32) );
 
             senf::Parse_UInt8 uint8()  const { return content().get<1>(); }
-            senf::Parse_UInt8 uint16() const { return content().get<2>(); }
-            senf::Parse_UInt8 uint24() const { return content().get<3>(); }
-            senf::Parse_UInt8 uint32() const { return content().get<4>(); }
+            senf::Parse_UInt16 uint16() const { return content().get<2>(); }
+            senf::Parse_UInt24 uint24() const { return content().get<3>(); }
+            senf::Parse_UInt32 uint32() const { return content().get<4>(); }
 
             void disable()    const { content().init<0>(); }
             void set_uint8()  const { content().init<1>(); }
-            void set_uint16() const { content().init<1>(); }
-            void set_uint24)  const { content().init<1>(); }
-            void set_uint23() const { content().init<1>(); }
+            void set_uint16() const { content().init<2>(); }
+            void set_uint24)  const { content().init<3>(); }
+            void set_uint23() const { content().init<4>(); }
 
             SENF_PARSER_FINALIZE(SomeParser);
         };