diff --git a/build.sbt b/build.sbt
index 52eef2bc..525ee461 100644
--- a/build.sbt
+++ b/build.sbt
@@ -17,6 +17,14 @@ ThisBuild / scalaVersion := scala212
 ThisBuild / organizationName := "foundweekends"
 ThisBuild / organizationHomepage := Some(url("https://foundweekends.org/"))
 ThisBuild / scalacOptions ++= Seq("-language:_", "-deprecation", "-Xlint", "-Xfuture")
+ThisBuild / scalacOptions ++= {
+  scalaBinaryVersion.value match {
+    case "3" =>
+      Nil
+    case _ =>
+      Seq("-Xsource:3")
+  }
+}
 ThisBuild / Compile / packageBin / publishArtifact := true
 ThisBuild / homepage := Some(url("https://www.foundweekends.org/giter8/"))
 ThisBuild / publishMavenStyle := true
diff --git a/library/src/main/scala/g8.scala b/library/src/main/scala/g8.scala
index d88de140..20fd5fd1 100644
--- a/library/src/main/scala/g8.scala
+++ b/library/src/main/scala/g8.scala
@@ -148,16 +148,16 @@ object G8 {
   }
 
   class STErrorHandler extends STErrorListener {
-    def compileTimeError(msg: STMessage) = {
+    def compileTimeError(msg: STMessage): Unit = {
       throw new STException(msg.toString, null)
     }
-    def runTimeError(msg: STMessage) = {
+    def runTimeError(msg: STMessage): Unit = {
       throw new STException(msg.toString, null)
     }
-    def IOError(msg: STMessage) = {
+    def IOError(msg: STMessage): Unit = {
       throw new STException(msg.toString, null)
     }
-    def internalError(msg: STMessage) = {
+    def internalError(msg: STMessage): Unit = {
       throw new STException(msg.toString, null)
     }
   }
diff --git a/library/src/main/scala/giter8/VersionNumber.scala b/library/src/main/scala/giter8/VersionNumber.scala
index d82412e4..339cc6e0 100644
--- a/library/src/main/scala/giter8/VersionNumber.scala
+++ b/library/src/main/scala/giter8/VersionNumber.scala
@@ -120,7 +120,7 @@ object VersionNumber {
     }
   }
 
-  implicit val versionNumberOrdering = new Ordering[VersionNumber] {
+  implicit val versionNumberOrdering: Ordering[VersionNumber] = new Ordering[VersionNumber] {
     override def compare(v1: VersionNumber, v2: VersionNumber): Int = {
       val matchedVersions = v1.numbers.zipAll(v2.numbers, 0L, 0L)