diff --git a/CHANGES.txt b/CHANGES.txt
index 174a5e01e..94483ee5e 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -5,6 +5,7 @@ December 11, 2012
 * Add -long-messages option; only show exceptions with errors when set
 * "warning treated as error" is a one-off error
 * Listen for issues reported by StringTemplate, report them as warnings
+* Fix template issues
 
 December 2, 2012
 
diff --git a/tool/resources/org/antlr/v4/tool/templates/codegen/Java/Java.stg b/tool/resources/org/antlr/v4/tool/templates/codegen/Java/Java.stg
index 45416c483..82b53d6e0 100644
--- a/tool/resources/org/antlr/v4/tool/templates/codegen/Java/Java.stg
+++ b/tool/resources/org/antlr/v4/tool/templates/codegen/Java/Java.stg
@@ -131,7 +131,7 @@ Parser(parser, funcs, atn, sempredFuncs, superClass) ::= <<
 <Parser_(ctor="parser_ctor", ...)>
 >>
 
-Parser_(parser, funcs, atn, sempredFuncs, ctor, extras, superClass) ::= <<
+Parser_(parser, funcs, atn, sempredFuncs, ctor, superClass) ::= <<
 @SuppressWarnings({"all", "warnings", "unchecked", "unused", "cast"})
 public class <parser.name> extends <superClass> {
 	protected static final DFA[] _decisionToDFA;
@@ -163,7 +163,6 @@ public class <parser.name> extends <superClass> {
 	public ATN getATN() { return _ATN; }
 
 	<namedActions.members>
-	<extras>
 	<parser:(ctor)()>
 	<funcs; separator="\n">
 
@@ -805,8 +804,6 @@ public class <lexer.name> extends <superClass> {
 	@Override
 	public ATN getATN() { return _ATN; }
 
-	<lexer.namedActions.members>
-
 	<dumpActions(lexer, "", actionFuncs, sempredFuncs)>
 	<atn>
 }