diff --git a/javascript/extractor/src/com/semmle/js/ast/AFunction.java b/javascript/extractor/src/com/semmle/js/ast/AFunction.java
index 34309d2fd5f..630b3f7d3e7 100644
--- a/javascript/extractor/src/com/semmle/js/ast/AFunction.java
+++ b/javascript/extractor/src/com/semmle/js/ast/AFunction.java
@@ -19,7 +19,7 @@ public class AFunction<B> {
   private final List<ITypeExpression> parameterTypes;
   private final ITypeExpression thisParameterType;
   private final List<DecoratorList> parameterDecorators;
-  private final IntList optionalParmaeterIndices;
+  private final IntList optionalParameterIndices;
 
   public static final IntList noOptionalParams = IntList.create(0, 0);
 
@@ -34,7 +34,7 @@ public class AFunction<B> {
       List<DecoratorList> parameterDecorators,
       ITypeExpression returnType,
       ITypeExpression thisParameterType,
-      IntList optionalParmaeterIndices) {
+      IntList optionalParameterIndices) {
     this.id = id;
     this.params = new ArrayList<IPattern>(params.size());
     this.defaults = new ArrayList<Expression>(params.size());
@@ -47,7 +47,7 @@ public class AFunction<B> {
     this.returnType = returnType;
     this.thisParameterType = thisParameterType;
     this.parameterDecorators = parameterDecorators;
-    this.optionalParmaeterIndices = optionalParmaeterIndices;
+    this.optionalParameterIndices = optionalParameterIndices;
 
     IPattern rest = null;
     for (Expression param : params) {
@@ -151,6 +151,6 @@ public class AFunction<B> {
   }
 
   public IntList getOptionalParmaeterIndices() {
-    return optionalParmaeterIndices;
+    return optionalParameterIndices;
   }
 }
diff --git a/javascript/extractor/src/com/semmle/js/parser/TypeScriptASTConverter.java b/javascript/extractor/src/com/semmle/js/parser/TypeScriptASTConverter.java
index 770ca667153..733eba38df1 100644
--- a/javascript/extractor/src/com/semmle/js/parser/TypeScriptASTConverter.java
+++ b/javascript/extractor/src/com/semmle/js/parser/TypeScriptASTConverter.java
@@ -1903,7 +1903,6 @@ public class TypeScriptASTConverter {
       ++index;
       if (param.getAsJsonObject().has("questionToken")) {
         list.add(index);
-        ;
       }
     }
     return list;
diff --git a/javascript/ql/src/semmle/javascript/TypeScript.qll b/javascript/ql/src/semmle/javascript/TypeScript.qll
index af976d9815f..7821c463d8e 100644
--- a/javascript/ql/src/semmle/javascript/TypeScript.qll
+++ b/javascript/ql/src/semmle/javascript/TypeScript.qll
@@ -2618,7 +2618,7 @@ class CallSignatureType extends @signature_type {
   /**
    * Holds if this signature declares a rest parameter, such as `(x: number, ...y: string[])`.
    */
-  predicate hasRestParameter() { signature_rest_parameter(this, _) } // TODO
+  predicate hasRestParameter() { signature_rest_parameter(this, _) }
 
   /**
    * Gets the type of the rest parameter, if any.