diff --git a/com.google.eclipse.protobuf/src/com/google/eclipse/protobuf/GenerateProtobuf.mwe2 b/com.google.eclipse.protobuf/src/com/google/eclipse/protobuf/GenerateProtobuf.mwe2
index 410fdeb..c2c5711 100644
--- a/com.google.eclipse.protobuf/src/com/google/eclipse/protobuf/GenerateProtobuf.mwe2
+++ b/com.google.eclipse.protobuf/src/com/google/eclipse/protobuf/GenerateProtobuf.mwe2
@@ -93,8 +93,8 @@
 			// quickfix API 
 			fragment = quickfix.QuickfixProviderFragment {}
 
-            // rename refactoring
-            fragment = refactoring.RefactorElementNameFragment {}
+      // rename refactoring
+      fragment = refactoring.RefactorElementNameFragment {}
 
 			// content assist API  
 			fragment = contentAssist.JavaBasedContentAssistFragment {}
diff --git a/com.google.eclipse.protobuf/src/com/google/eclipse/protobuf/Protobuf.xtext b/com.google.eclipse.protobuf/src/com/google/eclipse/protobuf/Protobuf.xtext
index 18637c3..3f6fc82 100644
--- a/com.google.eclipse.protobuf/src/com/google/eclipse/protobuf/Protobuf.xtext
+++ b/com.google.eclipse.protobuf/src/com/google/eclipse/protobuf/Protobuf.xtext
@@ -134,7 +134,7 @@
 ExtendMessage:
   'extend' message=MessageReference '{'
   elements+=MessageElement*
-  '}';
+  '}'(';')?;
 
 Service:
  'service' name=ID '{'