diff --git a/src/acorn/plugins/flow.js b/src/acorn/plugins/flow.js
index 1c4fdcce38..fad5277665 100644
--- a/src/acorn/plugins/flow.js
+++ b/src/acorn/plugins/flow.js
@@ -322,7 +322,7 @@ pp.flow_parseObjectType = function (allowStatic) {
 }
 
 pp.flow_objectTypeSemicolon = function () {
-  if (!this.eat(tt.semi) && this.type !== tt.braceR) {
+  if (!this.eat(tt.semi) && !this.eat(tt.comma) && this.type !== tt.braceR) {
     this.unexpected()
   }
 }
diff --git a/src/babel/generation/index.js b/src/babel/generation/index.js
index 5645491b0a..51a0914488 100644
--- a/src/babel/generation/index.js
+++ b/src/babel/generation/index.js
@@ -37,7 +37,7 @@ class CodeGenerator {
       retainLines: opts.retainLines,
       comments: opts.comments == null || opts.comments,
       compact: opts.compact,
-      quotes: CodeGenerator.findCommonStringDelimeter(code, tokens),
+      quotes: CodeGenerator.findCommonStringDelimiter(code, tokens),
       indent: {
         adjustMultilineComment: true,
         style: style,
@@ -56,7 +56,7 @@ class CodeGenerator {
     return format;
   }
 
-  static findCommonStringDelimeter(code, tokens) {
+  static findCommonStringDelimiter(code, tokens) {
     var occurences = {
       single: 0,
       double: 0
diff --git a/src/babel/transformation/file/plugin-manager.js b/src/babel/transformation/file/plugin-manager.js
index 3cb2faf1cc..21258797ac 100644
--- a/src/babel/transformation/file/plugin-manager.js
+++ b/src/babel/transformation/file/plugin-manager.js
@@ -1,3 +1,4 @@
+import * as node from  "../../api/node";
 import * as messages from "../../messages";
 import * as util from  "../../util";