--- openflow-2011-09-02.h	2015-07-23 09:54:16.612479340 -0700
+++ openflow-2011-09-02-2.h	2015-07-23 09:54:16.616479340 -0700
@@ -622,9 +622,11 @@
      *   - Exactly (match_len + 7)/8*8 - match_len (between 0 and 7) bytes of
      *     all-zero bytes
      */
+    uint8_t fields[4];         /* Make compiler happy */
 };
-OFP_ASSERT(sizeof(struct ofp_match) == 4);
+OFP_ASSERT(sizeof(struct ofp_match) == 8);
 
+/* Components of a OXM TLV header. */
 #define OXM_HEADER__(EXPERIMENTER, FIELD, HASMASK, LENGTH) \
     (((EXPERIMENTER) << 16) | ((FIELD) << 9) | ((HASMASK) << 8) | (LENGTH))
 #define OXM_HEADER(EXPERIMENTER, FIELD, LENGTH) \
@@ -1043,7 +1045,7 @@
     struct ofp_match match;       /* Fields to match. Variable size. */
     //struct ofp_instruction instructions[0]; /* Instruction set */
 };
-OFP_ASSERT(sizeof(struct ofp_flow_mod) == 48);
+OFP_ASSERT(sizeof(struct ofp_flow_mod) == 56);
 
 /* Group numbering. Groups can use any number up to OFPG_MAX. */
 enum ofp_group {
@@ -1126,7 +1128,7 @@
     uint64_t byte_count;
     struct ofp_match match;   /* Description of fields. Variable size. */
 };
-OFP_ASSERT(sizeof(struct ofp_flow_removed) == 48);
+OFP_ASSERT(sizeof(struct ofp_flow_removed) == 56);
 
 /* Values for 'type' in ofp_error_message.  These values are immutable: they
  * will not change in future versions of the protocol (although new values may
@@ -1425,7 +1427,7 @@
                                  no restriction. */
     struct ofp_match match;   /* Fields to match. Variable size. */
 };
-OFP_ASSERT(sizeof(struct ofp_flow_stats_request) == 32);
+OFP_ASSERT(sizeof(struct ofp_flow_stats_request) == 40);
 
 /* Body of reply to OFPST_FLOW request. */
 struct ofp_flow_stats {
@@ -1446,7 +1448,7 @@
     struct ofp_match match;   /* Description of fields. Variable size. */
     //struct ofp_instruction instructions[0]; /* Instruction set. */
 };
-OFP_ASSERT(sizeof(struct ofp_flow_stats) == 48);
+OFP_ASSERT(sizeof(struct ofp_flow_stats) == 56);
 
 /* Body for ofp_stats_request of type OFPST_AGGREGATE. */
 struct ofp_aggregate_stats_request {
@@ -1467,7 +1469,7 @@
                                  no restriction. */
     struct ofp_match match;   /* Fields to match. Variable size. */
 };
-OFP_ASSERT(sizeof(struct ofp_aggregate_stats_request) == 32);
+OFP_ASSERT(sizeof(struct ofp_aggregate_stats_request) == 40);
 
 /* Body of reply to OFPST_AGGREGATE request. */
 struct ofp_aggregate_stats_reply {