diff --git a/tool/resources/org/antlr/v4/tool/templates/codegen/Go/Go.stg b/tool/resources/org/antlr/v4/tool/templates/codegen/Go/Go.stg
index 5ec1db678..f973d9665 100644
--- a/tool/resources/org/antlr/v4/tool/templates/codegen/Go/Go.stg
+++ b/tool/resources/org/antlr/v4/tool/templates/codegen/Go/Go.stg
@@ -98,7 +98,7 @@ type <parser.name> struct {
     grammarFileName string
 }
 
-func New<parser.name>(input TokenStream) <parser.name> {
+func New<parser.name>(input antlr4.TokenStream) *<parser.name> {
 
     var decisionToDFA = make([]antlr4.DFA,len(deserializedAtn.DecisionToState))
     var sharedContextCache = antlr4.NewPredictionContextCache()
diff --git a/tool/src/org/antlr/v4/codegen/target/GoTarget.java b/tool/src/org/antlr/v4/codegen/target/GoTarget.java
index 6ad1ccf6c..be36ea39e 100644
--- a/tool/src/org/antlr/v4/codegen/target/GoTarget.java
+++ b/tool/src/org/antlr/v4/codegen/target/GoTarget.java
@@ -186,7 +186,7 @@ public class GoTarget extends Target {
 				return ((String)o).replace("\\u", "\\u005Cu");
 			}
 
-			return super.toString(o, formatString, locale).replace("\\'", "\'");
+			return super.toString(o, formatString, locale);
 		}
 
 	}