diff --git a/modules/server/src/main/scala/gql/server/Compiler.scala b/modules/server/src/main/scala/gql/server/Compiler.scala
index 26aaa2969..f4ce25616 100644
--- a/modules/server/src/main/scala/gql/server/Compiler.scala
+++ b/modules/server/src/main/scala/gql/server/Compiler.scala
@@ -25,7 +25,6 @@ import scala.concurrent.duration._
 import io.circe.syntax._
 import gql.preparation._
 import cats.parse.Caret
-import gql.server.planner.Planner
 
 sealed trait CompilationError
 object CompilationError {
diff --git a/modules/server/src/main/scala/gql/server/interpreter/QueryInterpreter.scala b/modules/server/src/main/scala/gql/server/interpreter/QueryInterpreter.scala
index e75f1a895..a349b129a 100644
--- a/modules/server/src/main/scala/gql/server/interpreter/QueryInterpreter.scala
+++ b/modules/server/src/main/scala/gql/server/interpreter/QueryInterpreter.scala
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2023 Valdemar Grange
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package gql.server.interpreter
 
 import cats.effect.implicits._
diff --git a/modules/server/src/main/scala/gql/server/interpreter/StreamInterpreter.scala b/modules/server/src/main/scala/gql/server/interpreter/StreamInterpreter.scala
index 989f15041..4e69e0190 100644
--- a/modules/server/src/main/scala/gql/server/interpreter/StreamInterpreter.scala
+++ b/modules/server/src/main/scala/gql/server/interpreter/StreamInterpreter.scala
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2023 Valdemar Grange
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package gql.server.interpreter
 
 import io.circe.syntax._
diff --git a/modules/server/src/main/scala/gql/server/interpreter/StreamingData.scala b/modules/server/src/main/scala/gql/server/interpreter/StreamingData.scala
index 69eb15c97..13804ed82 100644
--- a/modules/server/src/main/scala/gql/server/interpreter/StreamingData.scala
+++ b/modules/server/src/main/scala/gql/server/interpreter/StreamingData.scala
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2023 Valdemar Grange
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package gql.server.interpreter
 
 final case class StreamingData[F[_], A, B](
diff --git a/modules/server/src/main/scala/gql/server/interpreter/SubqueryInterpreter.scala b/modules/server/src/main/scala/gql/server/interpreter/SubqueryInterpreter.scala
index cd3063951..9bafbc05f 100644
--- a/modules/server/src/main/scala/gql/server/interpreter/SubqueryInterpreter.scala
+++ b/modules/server/src/main/scala/gql/server/interpreter/SubqueryInterpreter.scala
@@ -30,7 +30,7 @@ import io.circe.syntax._
 import gql._
 
 /** The [[SubqueryInterpreter]] recursively runs through the AST and performs a multitude of tasks:
-  *   - Runs the [[Resolver]]/[[Step]]s defined in the query.
+  *   - Runs the [[gql.resolver.Resolver]]/[[gql.resolver.Step]]s defined in the query.
   *   - Accumulates errors that occur during the evaluation of the query.
   *   - Logs streams that have been subscribed to.
   *   - Batches computations that have been marked as batchable.
@@ -82,7 +82,7 @@ object SubqueryInterpreter {
               case None     => W.pure(Chain.empty)
               case Some(cs) => runEdgeCont(cs, next)
             }
-          case d: StepCont.Done[F, ?] =>
+          case d: StepCont.Done[f, ?] =>
             startNext(d.prep, cs.map(_.node))
               .map(_.zipWith(cs) { case (j, IndexedData(i, _)) => (i, j) })
         }