diff --git a/packages/flutter_tools/lib/src/commands/analyze.dart b/packages/flutter_tools/lib/src/commands/analyze.dart
index 53e1b6aa54..2dfc9cdea3 100644
--- a/packages/flutter_tools/lib/src/commands/analyze.dart
+++ b/packages/flutter_tools/lib/src/commands/analyze.dart
@@ -96,6 +96,7 @@ class AnalyzeCommand extends FlutterCommand {
         pubSpecDirectories.add(flutterDir.path);
 
       // .../packages/*/bin/*.dart
+      // .../packages/*/lib/main.dart
       Directory packages = new Directory(path.join(ArtifactStore.flutterRoot, 'packages'));
       for (FileSystemEntity entry in packages.listSync()) {
         if (entry is Directory) {
@@ -109,6 +110,11 @@ class AnalyzeCommand extends FlutterCommand {
               }
             }
           }
+          String mainPath = path.join(entry.path, 'lib', 'main.dart');
+          if (FileSystemEntity.isFileSync(mainPath)) {
+            dartFiles.add(mainPath);
+            foundOne = true;
+          }
           if (foundOne)
             pubSpecDirectories.add(entry.path);
         }
@@ -298,4 +304,4 @@ class AnalyzeCommand extends FlutterCommand {
       print('No analyzer warnings!');
     return 0;
   }
-}
\ No newline at end of file
+}
diff --git a/packages/updater/lib/main.dart b/packages/updater/lib/main.dart
index 713eebe1d6..a14eb67c11 100644
--- a/packages/updater/lib/main.dart
+++ b/packages/updater/lib/main.dart
@@ -83,7 +83,7 @@ class UpdateTask {
 
   Future<yaml.YamlMap> _fetchManifest() async {
     String manifestUrl = _currentManifest['update-url'] + '/' + kManifestFile;
-    String manifestData = await http.get(manifestUrl);
+    String manifestData = (await http.get(manifestUrl)).body;
     return yaml.loadYaml(manifestData, sourceUrl: manifestUrl);
   }
 
diff --git a/packages/updater/lib/pipe_to_file.dart b/packages/updater/lib/pipe_to_file.dart
index 511a7a369e..cf307fe952 100644
--- a/packages/updater/lib/pipe_to_file.dart
+++ b/packages/updater/lib/pipe_to_file.dart
@@ -11,11 +11,11 @@ import 'package:mojo/core.dart';
 // Helper class to drain the contents of a mojo data pipe to a file.
 class PipeToFile {
   MojoDataPipeConsumer _consumer;
-  MojoEventStream _eventStream;
+  MojoEventSubscription _eventStream;
   IOSink _outputStream;
 
   PipeToFile(this._consumer, String outputPath) {
-    _eventStream = new MojoEventStream(_consumer.handle);
+    _eventStream = new MojoEventSubscription(_consumer.handle);
     _outputStream = new File(outputPath).openWrite();
   }
 
@@ -33,7 +33,7 @@ class PipeToFile {
   Future drain() async {
     Completer completer = new Completer();
     // TODO(mpcomplete): Is it legit to pass an async callback to listen?
-    _eventStream.listen((List<int> event) async {
+    _eventStream.subscribe((List<int> event) async {
       MojoHandleSignals mojoSignals = new MojoHandleSignals(event[1]);
       if (mojoSignals.isReadable) {
         MojoResult result = await _doRead();