diff --git a/lib/tiler/lib/src/sizer.dart b/lib/tiler/lib/src/sizer.dart
index a7e7a1c..d709898 100644
--- a/lib/tiler/lib/src/sizer.dart
+++ b/lib/tiler/lib/src/sizer.dart
@@ -20,7 +20,7 @@
   final TileModel tileAfter;
   final bool horizontal;
 
-  Sizer({
+  const Sizer({
     this.direction,
     this.tileBefore,
     this.tileAfter,
diff --git a/public/dart-pkg/fuchsia/sdk_ext/fuchsia.cc b/public/dart-pkg/fuchsia/sdk_ext/fuchsia.cc
index b829721..82cdbfa 100644
--- a/public/dart-pkg/fuchsia/sdk_ext/fuchsia.cc
+++ b/public/dart-pkg/fuchsia/sdk_ext/fuchsia.cc
@@ -25,7 +25,7 @@
 #include "third_party/tonic/dart_library_natives.h"
 #include "third_party/tonic/dart_state.h"
 #include "third_party/tonic/logging/dart_invoke.h"
-#include "third_party/tonic/typed_data/uint8_list.h"
+#include "third_party/tonic/typed_data/typed_list.h"
 
 using tonic::ToDart;
 
diff --git a/public/dart-pkg/zircon/sdk_ext/natives.cc b/public/dart-pkg/zircon/sdk_ext/natives.cc
index a4725fa..7e63eb8 100644
--- a/public/dart-pkg/zircon/sdk_ext/natives.cc
+++ b/public/dart-pkg/zircon/sdk_ext/natives.cc
@@ -25,7 +25,7 @@
 #include "third_party/tonic/dart_library_natives.h"
 #include "third_party/tonic/dart_state.h"
 #include "third_party/tonic/logging/dart_invoke.h"
-#include "third_party/tonic/typed_data/uint8_list.h"
+#include "third_party/tonic/typed_data/typed_list.h"
 
 using tonic::ToDart;
 
diff --git a/runtime/dart_runner/service_isolate.cc b/runtime/dart_runner/service_isolate.cc
index 0181f33..cdcf43f 100644
--- a/runtime/dart_runner/service_isolate.cc
+++ b/runtime/dart_runner/service_isolate.cc
@@ -9,7 +9,7 @@
 #include "third_party/tonic/dart_library_natives.h"
 #include "third_party/tonic/dart_microtask_queue.h"
 #include "third_party/tonic/dart_state.h"
-#include "third_party/tonic/typed_data/uint8_list.h"
+#include "third_party/tonic/typed_data/typed_list.h"
 #include "topaz/runtime/dart/utils/inlines.h"
 
 #include "topaz/runtime/dart_runner/builtin_libraries.h"
diff --git a/runtime/flutter_runner/BUILD.gn b/runtime/flutter_runner/BUILD.gn
index 07bb95a..6051678 100644
--- a/runtime/flutter_runner/BUILD.gn
+++ b/runtime/flutter_runner/BUILD.gn
@@ -17,6 +17,7 @@
   enable_software = false
   enable_gl = false
   enable_vulkan = true
+  enable_metal = false
 }
 
 # Dependencies for flutter tooling
diff --git a/shell/keyboard/lib/keyboard.dart b/shell/keyboard/lib/keyboard.dart
index 5a4354f..e95eee0 100644
--- a/shell/keyboard/lib/keyboard.dart
+++ b/shell/keyboard/lib/keyboard.dart
@@ -97,7 +97,7 @@
   final VoidCallback onHide;
 
   /// Constructor.
-  Keyboard(
+  const Keyboard(
       {Key key,
       this.onText,
       this.onSuggestion,