diff --git a/pipelines/fabric-pro/src/main/resources/p4c-out/tofino/fabric/mavericks/context.json b/pipelines/fabric-pro/src/main/resources/p4c-out/tofino/fabric/mavericks/context.json
index 0f49258..4a7f86f 100644
--- a/pipelines/fabric-pro/src/main/resources/p4c-out/tofino/fabric/mavericks/context.json
+++ b/pipelines/fabric-pro/src/main/resources/p4c-out/tofino/fabric/mavericks/context.json
@@ -1,6 +1,6 @@
 {
-  "build_date": "01/31/18 02:07:27",
-  "compiler_version": "6.0.0-alpha.3",
+  "build_date": "02/01/18 21:21:59",
+  "compiler_version": "6.0.0-alpha.4",
   "program_name": "main",
   "learn_quanta": [],
   "dynamic_hash_calculations": [],
@@ -26775,14 +26775,14 @@
       "stage_tables": [
         {
           "stage_number": 2,
-          "size": 4096,
+          "size": 2048,
           "stage_table_type": "statistics",
           "logical_table_id": 1,
           "pack_format": [
             {
               "table_word_width": 128,
               "memory_word_width": 128,
-              "entries_per_table_word": 4,
+              "entries_per_table_word": 2,
               "number_memory_units_per_table_word": 1
             }
           ],
@@ -26800,9 +26800,9 @@
       "how_referenced": "indirect",
       "enable_pfe": false,
       "pfe_bit_position": 0,
-      "byte_counter_resolution": 0,
-      "packet_counter_resolution": 32,
-      "statistics_type": "packets"
+      "byte_counter_resolution": 36,
+      "packet_counter_resolution": 28,
+      "statistics_type": "packets_and_bytes"
     },
     {
       "direction": "ingress",
@@ -32823,7 +32823,7 @@
         }
       ],
       "stateful_table_refs": [],
-      "default_action_handle": 0,
+      "default_action_handle": 536870940,
       "action_profile": "",
       "default_next_table_mask": 0,
       "ap_bind_indirect_res_to_match": [],
@@ -35800,7 +35800,7 @@
       "stateful_table_refs": [],
       "default_selector_mask": 0,
       "default_selector_value": 0,
-      "default_action_handle": 0,
+      "default_action_handle": 536870945,
       "action_profile": "next.ecmp_selector",
       "default_next_table_mask": 0,
       "ap_bind_indirect_res_to_match": [],
@@ -39092,14 +39092,14 @@
       "stage_tables": [
         {
           "stage_number": 8,
-          "size": 4096,
+          "size": 2048,
           "stage_table_type": "statistics",
           "logical_table_id": 1,
           "pack_format": [
             {
               "table_word_width": 128,
               "memory_word_width": 128,
-              "entries_per_table_word": 4,
+              "entries_per_table_word": 2,
               "number_memory_units_per_table_word": 1
             }
           ],
@@ -39117,9 +39117,9 @@
       "how_referenced": "indirect",
       "enable_pfe": false,
       "pfe_bit_position": 0,
-      "byte_counter_resolution": 0,
-      "packet_counter_resolution": 32,
-      "statistics_type": "packets"
+      "byte_counter_resolution": 36,
+      "packet_counter_resolution": 28,
+      "statistics_type": "packets_and_bytes"
     },
     {
       "direction": "ingress",
@@ -39144,7 +39144,7 @@
         }
       ],
       "stateful_table_refs": [],
-      "default_action_handle": 0,
+      "default_action_handle": 536870949,
       "action_profile": "",
       "default_next_table_mask": 0,
       "ap_bind_indirect_res_to_match": [],
@@ -41682,12 +41682,12 @@
     {
       "fully_qualified_name": "mau[7].dp.match_input_xbar_din_power_ctl",
       "name": "stage_7_match_input_xbar_din_power_ctl",
-      "value": "00000013000000000000000000000000000000c0000000000000000000000000000000400000000e00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
+      "value": "0000001c000000000000000000000000000000c0000000000000000000000000000000400000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
     },
     {
       "fully_qualified_name": "mau[7].dp.xbar_hash.hash.parity_group_mask",
       "name": "stage_7_parity_group_mask",
-      "value": "00000001000000000000000e00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
+      "value": "00000001000000000000000c00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
     },
     {
       "fully_qualified_name": "mau[8].dp.match_input_xbar_din_power_ctl",
diff --git a/pipelines/fabric-pro/src/main/resources/p4c-out/tofino/fabric/mavericks/fabric.p4info b/pipelines/fabric-pro/src/main/resources/p4c-out/tofino/fabric/mavericks/fabric.p4info
index 80e0880..28fc18c 100644
--- a/pipelines/fabric-pro/src/main/resources/p4c-out/tofino/fabric/mavericks/fabric.p4info
+++ b/pipelines/fabric-pro/src/main/resources/p4c-out/tofino/fabric/mavericks/fabric.p4info
@@ -579,7 +579,7 @@
     alias: "egress_port_counter"
   }
   spec {
-    unit: PACKETS
+    unit: BOTH
   }
   size: 511
 }
@@ -590,7 +590,7 @@
     alias: "ingress_port_counter"
   }
   spec {
-    unit: PACKETS
+    unit: BOTH
   }
   size: 511
 }
@@ -725,6 +725,7 @@
   preamble {
     id: 2868916615
     name: "packet_out"
+    annotations: "@not_extracted_in_egress()"
     annotations: "@controller_header(\"packet_out\")"
   }
   metadata {
diff --git a/pipelines/fabric-pro/src/main/resources/p4c-out/tofino/fabric/mavericks/tofino.bin b/pipelines/fabric-pro/src/main/resources/p4c-out/tofino/fabric/mavericks/tofino.bin
index 8bff8f4..61eaab9 100644
--- a/pipelines/fabric-pro/src/main/resources/p4c-out/tofino/fabric/mavericks/tofino.bin
+++ b/pipelines/fabric-pro/src/main/resources/p4c-out/tofino/fabric/mavericks/tofino.bin
Binary files differ
diff --git a/pipelines/fabric-pro/src/main/resources/p4c-out/tofino/fabric/montana/context.json b/pipelines/fabric-pro/src/main/resources/p4c-out/tofino/fabric/montana/context.json
index 51b809f..6de94c1 100644
--- a/pipelines/fabric-pro/src/main/resources/p4c-out/tofino/fabric/montana/context.json
+++ b/pipelines/fabric-pro/src/main/resources/p4c-out/tofino/fabric/montana/context.json
@@ -1,6 +1,6 @@
 {
-  "build_date": "01/31/18 02:07:41",
-  "compiler_version": "6.0.0-alpha.3",
+  "build_date": "02/01/18 21:22:14",
+  "compiler_version": "6.0.0-alpha.4",
   "program_name": "main",
   "learn_quanta": [],
   "dynamic_hash_calculations": [],
@@ -26775,14 +26775,14 @@
       "stage_tables": [
         {
           "stage_number": 2,
-          "size": 4096,
+          "size": 2048,
           "stage_table_type": "statistics",
           "logical_table_id": 1,
           "pack_format": [
             {
               "table_word_width": 128,
               "memory_word_width": 128,
-              "entries_per_table_word": 4,
+              "entries_per_table_word": 2,
               "number_memory_units_per_table_word": 1
             }
           ],
@@ -26800,9 +26800,9 @@
       "how_referenced": "indirect",
       "enable_pfe": false,
       "pfe_bit_position": 0,
-      "byte_counter_resolution": 0,
-      "packet_counter_resolution": 32,
-      "statistics_type": "packets"
+      "byte_counter_resolution": 36,
+      "packet_counter_resolution": 28,
+      "statistics_type": "packets_and_bytes"
     },
     {
       "direction": "ingress",
@@ -32823,7 +32823,7 @@
         }
       ],
       "stateful_table_refs": [],
-      "default_action_handle": 0,
+      "default_action_handle": 536870940,
       "action_profile": "",
       "default_next_table_mask": 0,
       "ap_bind_indirect_res_to_match": [],
@@ -35800,7 +35800,7 @@
       "stateful_table_refs": [],
       "default_selector_mask": 0,
       "default_selector_value": 0,
-      "default_action_handle": 0,
+      "default_action_handle": 536870945,
       "action_profile": "next.ecmp_selector",
       "default_next_table_mask": 0,
       "ap_bind_indirect_res_to_match": [],
@@ -39092,14 +39092,14 @@
       "stage_tables": [
         {
           "stage_number": 8,
-          "size": 4096,
+          "size": 2048,
           "stage_table_type": "statistics",
           "logical_table_id": 1,
           "pack_format": [
             {
               "table_word_width": 128,
               "memory_word_width": 128,
-              "entries_per_table_word": 4,
+              "entries_per_table_word": 2,
               "number_memory_units_per_table_word": 1
             }
           ],
@@ -39117,9 +39117,9 @@
       "how_referenced": "indirect",
       "enable_pfe": false,
       "pfe_bit_position": 0,
-      "byte_counter_resolution": 0,
-      "packet_counter_resolution": 32,
-      "statistics_type": "packets"
+      "byte_counter_resolution": 36,
+      "packet_counter_resolution": 28,
+      "statistics_type": "packets_and_bytes"
     },
     {
       "direction": "ingress",
@@ -39144,7 +39144,7 @@
         }
       ],
       "stateful_table_refs": [],
-      "default_action_handle": 0,
+      "default_action_handle": 536870949,
       "action_profile": "",
       "default_next_table_mask": 0,
       "ap_bind_indirect_res_to_match": [],
@@ -41682,12 +41682,12 @@
     {
       "fully_qualified_name": "mau[7].dp.match_input_xbar_din_power_ctl",
       "name": "stage_7_match_input_xbar_din_power_ctl",
-      "value": "00000013000000000000000000000000000000c0000000000000000000000000000000400000000e00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
+      "value": "0000001c000000000000000000000000000000c0000000000000000000000000000000400000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
     },
     {
       "fully_qualified_name": "mau[7].dp.xbar_hash.hash.parity_group_mask",
       "name": "stage_7_parity_group_mask",
-      "value": "00000001000000000000000e00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
+      "value": "00000001000000000000000c00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
     },
     {
       "fully_qualified_name": "mau[8].dp.match_input_xbar_din_power_ctl",
diff --git a/pipelines/fabric-pro/src/main/resources/p4c-out/tofino/fabric/montana/fabric.p4info b/pipelines/fabric-pro/src/main/resources/p4c-out/tofino/fabric/montana/fabric.p4info
index 80e0880..28fc18c 100644
--- a/pipelines/fabric-pro/src/main/resources/p4c-out/tofino/fabric/montana/fabric.p4info
+++ b/pipelines/fabric-pro/src/main/resources/p4c-out/tofino/fabric/montana/fabric.p4info
@@ -579,7 +579,7 @@
     alias: "egress_port_counter"
   }
   spec {
-    unit: PACKETS
+    unit: BOTH
   }
   size: 511
 }
@@ -590,7 +590,7 @@
     alias: "ingress_port_counter"
   }
   spec {
-    unit: PACKETS
+    unit: BOTH
   }
   size: 511
 }
@@ -725,6 +725,7 @@
   preamble {
     id: 2868916615
     name: "packet_out"
+    annotations: "@not_extracted_in_egress()"
     annotations: "@controller_header(\"packet_out\")"
   }
   metadata {
diff --git a/pipelines/fabric-pro/src/main/resources/p4c-out/tofino/fabric/montana/tofino.bin b/pipelines/fabric-pro/src/main/resources/p4c-out/tofino/fabric/montana/tofino.bin
index ae97e50..c0d72a5 100644
--- a/pipelines/fabric-pro/src/main/resources/p4c-out/tofino/fabric/montana/tofino.bin
+++ b/pipelines/fabric-pro/src/main/resources/p4c-out/tofino/fabric/montana/tofino.bin
Binary files differ