diff --git a/build.gradle b/build.gradle
index ddf6d0b2e..e22fdfdc3 100644
--- a/build.gradle
+++ b/build.gradle
@@ -50,7 +50,7 @@
         }
 
         server {
-            workingDirectory project.file("run/server-${mc_version}")
+            workingDirectory project.file("run/server")
             property 'forge.logging.markers', 'REGISTRIES,REGISTRYDUMP'
             property 'forge.logging.console.level', 'debug'
 
@@ -388,14 +388,14 @@ task docWebsite(type: Copy, dependsOn: [illuaminateDocs]) {
     it.configure {
         include("**/*.java")
         exclude("dan200/computercraft/api/**")
-        header rootProject.file('config/license/main.txt')
+        header file('config/license/main.txt')
     }
 }
 
 [licenseTest, licenseFormatTest].forEach {
     it.configure {
         include("**/*.java")
-        header rootProject.file('config/license/main.txt')
+        header file('config/license/main.txt')
     }
 }
 
@@ -412,7 +412,7 @@ task docWebsite(type: Copy, dependsOn: [illuaminateDocs]) {
     it.configure {
         source = sourceSets.main.java
         include("dan200/computercraft/api/**")
-        header rootProject.file('config/license/api.txt')
+        header file('config/license/api.txt')
     }
 }
 
@@ -430,7 +430,7 @@ task docWebsite(type: Copy, dependsOn: [illuaminateDocs]) {
         def ok = true
 
         // Check we're targetting the current version
-        def whatsnew = new File("src/main/resources/data/computercraft/lua/rom/help/whatsnew.txt").readLines()
+        def whatsnew = new File(projectDir, "src/main/resources/data/computercraft/lua/rom/help/whatsnew.txt").readLines()
         if (whatsnew[0] != "New features in CC: Tweaked $mod_version") {
             ok = false
             project.logger.error("Expected `whatsnew.txt' to target $mod_version.")
@@ -447,7 +447,7 @@ task docWebsite(type: Copy, dependsOn: [illuaminateDocs]) {
 
         // Check whatsnew and changelog match.
         def versionChangelog = "# " + whatsnew.join("\n")
-        def changelog = new File("src/main/resources/data/computercraft/lua/rom/help/changelog.txt").getText()
+        def changelog = new File(projectDir, "src/main/resources/data/computercraft/lua/rom/help/changelog.txt").getText()
         if (!changelog.startsWith(versionChangelog)) {
             ok = false
             project.logger.error("whatsnew and changelog are not in sync")
@@ -535,7 +535,7 @@ task docWebsite(type: Copy, dependsOn: [illuaminateDocs]) {
     tagName "v${mc_version}-${mod_version}"
     releaseName "[${mc_version}] ${mod_version}"
     body {
-        "## " + new File("src/main/resources/data/computercraft/lua/rom/help/whatsnew.txt")
+        "## " + new File(projectDir, "src/main/resources/data/computercraft/lua/rom/help/whatsnew.txt")
             .readLines()
             .takeWhile { it != 'Type "help changelog" to see the full version history.' }
             .join("\n").trim()
diff --git a/config/checkstyle/checkstyle.xml b/config/checkstyle/checkstyle.xml
index 03959f78e..89de6f153 100644
--- a/config/checkstyle/checkstyle.xml
+++ b/config/checkstyle/checkstyle.xml
@@ -7,7 +7,7 @@
     <property name="charset" value="UTF-8" />
 
     <module name="SuppressionFilter">
-        <property name="file" value="config/checkstyle/suppressions.xml" />
+	<property name="file" value="${config_loc}/suppressions.xml" />
     </module>
 
     <module name="BeforeExecutionExclusionFileFilter">