diff --git a/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/parser/antlr/Antlr4ToolFacade.java b/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/parser/antlr/Antlr4ToolFacade.java
index 8a399b8bf..c5b8548a3 100644
--- a/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/parser/antlr/Antlr4ToolFacade.java
+++ b/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/parser/antlr/Antlr4ToolFacade.java
@@ -50,8 +50,8 @@ public class Antlr4ToolFacade {
 		this.loader = loader;
 	}
 
-	private String downloadURL = "http://www.antlr.org/download/antlr-4.5.3-complete.jar";
-	private boolean askBeforeDownload = true;
+	private String downloadURL = "https://www.antlr.org/download/antlr-4.5.3-complete.jar";
+	private boolean askBeforeDownload = false;
 	
 	public static final String ANTLR4GEN = "antlr4gen";
 	public static final String TARGETFOLDER = ANTLR4GEN + "/target/";
diff --git a/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/parser/antlr/CodebuffToolFacade.java b/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/parser/antlr/CodebuffToolFacade.java
index 3ee169d64..2bfae6e80 100644
--- a/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/parser/antlr/CodebuffToolFacade.java
+++ b/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/parser/antlr/CodebuffToolFacade.java
@@ -31,7 +31,7 @@ public class CodebuffToolFacade {
 	}
 
 	private String downloadURL = "https://github.com/holgerschill/codebuff_mirror/raw/master/codebuff-1.5.1.jar";
-	private boolean askBeforeDownload = true;
+	private boolean askBeforeDownload = false;
 
 	public void setAskBeforeDownload(boolean shouldAsk) {
 		this.askBeforeDownload = shouldAsk;
diff --git a/org.eclipse.xtext.xtext.generator/xtend-gen/org/eclipse/xtext/xtext/generator/parser/antlr/Antlr4Grammar.java b/org.eclipse.xtext.xtext.generator/xtend-gen/org/eclipse/xtext/xtext/generator/parser/antlr/Antlr4Grammar.java
index 65d5866e2..7f70fa674 100644
--- a/org.eclipse.xtext.xtext.generator/xtend-gen/org/eclipse/xtext/xtext/generator/parser/antlr/Antlr4Grammar.java
+++ b/org.eclipse.xtext.xtext.generator/xtend-gen/org/eclipse/xtext/xtext/generator/parser/antlr/Antlr4Grammar.java
@@ -28,8 +28,7 @@ public class Antlr4Grammar extends AntlrGrammar {
   @Override
   @Pure
   public int hashCode() {
-    int result = super.hashCode();
-    return result;
+    return super.hashCode();
   }
   
   @Override
@@ -49,9 +48,8 @@ public class Antlr4Grammar extends AntlrGrammar {
   @Override
   @Pure
   public String toString() {
-    String result = new ToStringBuilder(this)
+    return new ToStringBuilder(this)
     	.addAllFields()
     	.toString();
-    return result;
   }
 }
diff --git a/org.eclipse.xtext.xtext.generator/xtend-gen/org/eclipse/xtext/xtext/generator/parser/antlr/CodebuffAntlrGrammarGenerator.java b/org.eclipse.xtext.xtext.generator/xtend-gen/org/eclipse/xtext/xtext/generator/parser/antlr/CodebuffAntlrGrammarGenerator.java
index c567d04da..ed1efce25 100644
--- a/org.eclipse.xtext.xtext.generator/xtend-gen/org/eclipse/xtext/xtext/generator/parser/antlr/CodebuffAntlrGrammarGenerator.java
+++ b/org.eclipse.xtext.xtext.generator/xtend-gen/org/eclipse/xtext/xtext/generator/parser/antlr/CodebuffAntlrGrammarGenerator.java
@@ -141,6 +141,7 @@ public class CodebuffAntlrGrammarGenerator extends AbstractAntlrGrammarGenerator
     return _builder;
   }
   
+  @Override
   protected CharSequence compileRule(final Object it, final Grammar grammar, final AntlrOptions options) {
     if (it instanceof EnumRule) {
       return _compileRule((EnumRule)it, grammar, options);