diff --git a/pom.xml b/pom.xml
index bc3e8b5..3a0558b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -56,7 +56,7 @@
     <jackson.version>2.17.2</jackson.version>
     <slf4j.version>2.0.16</slf4j.version>
     <okhttp.version>4.12.0</okhttp.version>
-    <autograder.version>0.6.0</autograder.version>
+    <autograder.version>0.6.1</autograder.version>
     <jgit.version>7.0.0.202409031743-r</jgit.version>
     <junit.version>5.11.0</junit.version>
     <versions-maven-plugin.version>2.17.1</versions-maven-plugin.version>
diff --git a/src/main/java/edu/kit/kastel/sdq/artemis4j/grading/Assessment.java b/src/main/java/edu/kit/kastel/sdq/artemis4j/grading/Assessment.java
index cad034c..e8625c1 100644
--- a/src/main/java/edu/kit/kastel/sdq/artemis4j/grading/Assessment.java
+++ b/src/main/java/edu/kit/kastel/sdq/artemis4j/grading/Assessment.java
@@ -90,7 +90,7 @@ public Assessment(
                 result.feedbacks());
 
         // Unpack the result
-        this.annotations = MetaFeedbackMapper.parseMetaFeedbacks(feedbacks, config);
+        this.annotations = Collections.synchronizedList(MetaFeedbackMapper.parseMetaFeedbacks(feedbacks, config));
         this.testResults = feedbacks.stream()
                 .filter(f -> f.type() == FeedbackType.AUTOMATIC)
                 .map(TestResult::new)
diff --git a/src/main/java/edu/kit/kastel/sdq/artemis4j/grading/autograder/AutograderRunner.java b/src/main/java/edu/kit/kastel/sdq/artemis4j/grading/autograder/AutograderRunner.java
index 9937b43..452ecb7 100644
--- a/src/main/java/edu/kit/kastel/sdq/artemis4j/grading/autograder/AutograderRunner.java
+++ b/src/main/java/edu/kit/kastel/sdq/artemis4j/grading/autograder/AutograderRunner.java
@@ -70,9 +70,9 @@ public static AutograderStats runAutograder(
                 var position = problem.getPosition();
                 assessment.addAutograderAnnotation(
                         mistakeType,
-                        position.path().toString(),
-                        position.startLine(),
-                        position.endLine(),
+                        "src/" + position.path().toString(),
+                        position.startLine() - 1,
+                        position.endLine() - 1,
                         autograder.translateMessage(problem.getExplanation()));
             }