diff --git a/src/main/java/de/dennisguse/opentracks/data/CustomContentProvider.java b/src/main/java/de/dennisguse/opentracks/data/CustomContentProvider.java
index b25015dcc..543ddf929 100644
--- a/src/main/java/de/dennisguse/opentracks/data/CustomContentProvider.java
+++ b/src/main/java/de/dennisguse/opentracks/data/CustomContentProvider.java
@@ -292,15 +292,9 @@ public class CustomContentProvider extends ContentProvider {
     public int update(@NonNull Uri url, ContentValues values, String where, String[] selectionArgs) {
         String table;
         switch (getUrlType(url)) {
-            case TRACKPOINTS -> {
-                table = TrackPointsColumns.TABLE_NAME;
-            }
-            case TRACKS -> {
-                table = TracksColumns.TABLE_NAME;
-            }
-            case MARKERS -> {
-                table = MarkerColumns.TABLE_NAME;
-            }
+            case TRACKPOINTS -> table = TrackPointsColumns.TABLE_NAME;
+            case TRACKS -> table = TracksColumns.TABLE_NAME;
+            case MARKERS -> table = MarkerColumns.TABLE_NAME;
             default -> throw new IllegalArgumentException("Unknown url " + url);
         }
 
diff --git a/src/main/java/de/dennisguse/opentracks/data/models/Distance.java b/src/main/java/de/dennisguse/opentracks/data/models/Distance.java
index 14e7646e7..9b83ddd98 100644
--- a/src/main/java/de/dennisguse/opentracks/data/models/Distance.java
+++ b/src/main/java/de/dennisguse/opentracks/data/models/Distance.java
@@ -7,7 +7,7 @@ import de.dennisguse.opentracks.settings.UnitSystem;
 
 public record Distance(double distance_m) {
 
-    public static Distance ZERO = Distance.of(0);
+    public static final Distance ZERO = Distance.of(0);
 
     public static Distance of(double distance_m) {
         return new Distance(distance_m);
diff --git a/src/main/java/de/dennisguse/opentracks/data/models/Speed.java b/src/main/java/de/dennisguse/opentracks/data/models/Speed.java
index 028e4813b..598967c10 100644
--- a/src/main/java/de/dennisguse/opentracks/data/models/Speed.java
+++ b/src/main/java/de/dennisguse/opentracks/data/models/Speed.java
@@ -6,7 +6,7 @@ import de.dennisguse.opentracks.settings.UnitSystem;
 
 public record Speed(double speed_mps) {
 
-    public static Speed ZERO = Speed.of(0);
+    public static final Speed ZERO = Speed.of(0);
 
     public static Speed of(Distance distance, Duration duration) {
         if (duration.isZero()) {
@@ -20,11 +20,6 @@ public record Speed(double speed_mps) {
         return new Speed(speed_mps);
     }
 
-    @Deprecated //TODO Remove
-    public static Speed of(String speed_mps) {
-        return of(Float.parseFloat(speed_mps));
-    }
-
     public static Speed ofKMH(double speed_kmh) {
         return of(Distance.ofKilometer(speed_kmh), Duration.ofHours(1));
     }
diff --git a/src/main/java/de/dennisguse/opentracks/io/file/importer/GPXTrackImporter.java b/src/main/java/de/dennisguse/opentracks/io/file/importer/GPXTrackImporter.java
index e0bd763a8..4358e0c38 100644
--- a/src/main/java/de/dennisguse/opentracks/io/file/importer/GPXTrackImporter.java
+++ b/src/main/java/de/dennisguse/opentracks/io/file/importer/GPXTrackImporter.java
@@ -326,7 +326,7 @@ public class GPXTrackImporter extends DefaultHandler implements XMLImporter.Trac
 
         if (speed != null) {
             try {
-                speedParsed = Speed.of(speed);
+                speedParsed = Speed.of(Float.parseFloat(speed));
             } catch (NumberFormatException e) {
                 throw new ParsingException(createErrorMessage(String.format(Locale.US, "Unable to parse speed: %s", speed)), e);
             }
diff --git a/src/main/java/de/dennisguse/opentracks/io/file/importer/TrackImporter.java b/src/main/java/de/dennisguse/opentracks/io/file/importer/TrackImporter.java
index 6804a4bce..4a070b947 100644
--- a/src/main/java/de/dennisguse/opentracks/io/file/importer/TrackImporter.java
+++ b/src/main/java/de/dennisguse/opentracks/io/file/importer/TrackImporter.java
@@ -159,7 +159,7 @@ public class TrackImporter {
         // Store Markers
         updateMarkers(trackId);
 
-        contentProviderUtils.bulkInsertMarkers(markers.stream().map(it -> it.getMarker()).toList(), trackId);
+        contentProviderUtils.bulkInsertMarkers(markers.stream().map(MarkerBuilder::getMarker).toList(), trackId);
 
         //Clear up.
         trackPoints.clear();
@@ -248,7 +248,7 @@ public class TrackImporter {
     }
 
 
-    private class TrackData {
+    private static class TrackData {
         private String name;
         private UUID uuid;
         private String description;