diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0a26882..b27c9e0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -114,30 +114,6 @@ unit_test windows/x86:
     - linux-build
   timeout: 5m
 
-build linux/ubuntu/2004/amd64/gcc:
-  <<: *build_linux_ubuntu_gcc
-  image: ubuntu:20.04
-
-unit_test linux/ubuntu/2004/amd64/gcc:
-  <<: *test_linux_ubuntu_gcc
-  image: ubuntu:20.04
-  dependencies:
-    - build linux/ubuntu/2004/amd64/gcc
-  needs:
-    - build linux/ubuntu/2004/amd64/gcc
-
-build linux/ubuntu/2004/amd64/clang:
-  <<: *build_linux_ubuntu_clang
-  image: ubuntu:20.04
-
-unit_test linux/ubuntu/2004/amd64/clang:
-  <<: *test_linux_ubuntu_clang
-  image: ubuntu:20.04
-  dependencies:
-    - build linux/ubuntu/2004/amd64/clang
-  needs:
-    - build linux/ubuntu/2004/amd64/clang
-
 build linux/ubuntu/2204/amd64/gcc:
   <<: *build_linux_ubuntu_gcc
   image: ubuntu:22.04
@@ -162,6 +138,30 @@ unit_test linux/ubuntu/2204/amd64/clang:
   needs:
     - build linux/ubuntu/2204/amd64/clang
 
+build linux/ubuntu/2404/amd64/gcc:
+  <<: *build_linux_ubuntu_gcc
+  image: ubuntu:24.04
+
+unit_test linux/ubuntu/2404/amd64/gcc:
+  <<: *test_linux_ubuntu_gcc
+  image: ubuntu:24.04
+  dependencies:
+    - build linux/ubuntu/2404/amd64/gcc
+  needs:
+    - build linux/ubuntu/2404/amd64/gcc
+
+build linux/ubuntu/2404/amd64/clang:
+  <<: *build_linux_ubuntu_clang
+  image: ubuntu:24.04
+
+unit_test linux/ubuntu/2404/amd64/clang:
+  <<: *test_linux_ubuntu_clang
+  image: ubuntu:24.04
+  dependencies:
+    - build linux/ubuntu/2404/amd64/clang
+  needs:
+    - build linux/ubuntu/2404/amd64/clang
+
 #-------------------------------------------------------------------------------
 # Fedora
 #-------------------------------------------------------------------------------
@@ -234,54 +234,6 @@ unit_test linux/ubuntu/2204/amd64/clang:
     - linux-build
   timeout: 5m
 
-build linux/fedora/39/amd64/gcc:
-  <<: *build_linux_fedora_gcc
-  image: fedora:39
-
-unit_test linux/fedora/39/amd64/gcc:
-  <<: *test_linux_fedora_gcc
-  image: fedora:39
-  dependencies:
-    - build linux/fedora/39/amd64/gcc
-  needs:
-    - build linux/fedora/39/amd64/gcc
-
-build linux/fedora/39/amd64/clang:
-  <<: *build_linux_fedora_clang
-  image: fedora:39
-
-unit_test linux/fedora/39/amd64/clang:
-  <<: *test_linux_fedora_clang
-  image: fedora:39
-  dependencies:
-    - build linux/fedora/39/amd64/clang
-  needs:
-    - build linux/fedora/39/amd64/clang
-
-build linux/fedora/40/amd64/gcc:
-  <<: *build_linux_fedora_gcc
-  image: fedora:40
-
-unit_test linux/fedora/40/amd64/gcc:
-  <<: *test_linux_fedora_gcc
-  image: fedora:40
-  dependencies:
-    - build linux/fedora/40/amd64/gcc
-  needs:
-    - build linux/fedora/40/amd64/gcc
-
-build linux/fedora/40/amd64/clang:
-  <<: *build_linux_fedora_clang
-  image: fedora:40
-
-unit_test linux/fedora/40/amd64/clang:
-  <<: *test_linux_fedora_clang
-  image: fedora:40
-  dependencies:
-    - build linux/fedora/40/amd64/clang
-  needs:
-    - build linux/fedora/40/amd64/clang
-
 build linux/fedora/41/amd64/gcc:
   <<: *build_linux_fedora_gcc
   image: fedora:41
@@ -306,6 +258,30 @@ unit_test linux/fedora/41/amd64/clang:
   needs:
     - build linux/fedora/41/amd64/clang
 
+build linux/fedora/42/amd64/gcc:
+  <<: *build_linux_fedora_gcc
+  image: fedora:42
+
+unit_test linux/fedora/42/amd64/gcc:
+  <<: *test_linux_fedora_gcc
+  image: fedora:42
+  dependencies:
+    - build linux/fedora/42/amd64/gcc
+  needs:
+    - build linux/fedora/42/amd64/gcc
+
+build linux/fedora/42/amd64/clang:
+  <<: *build_linux_fedora_clang
+  image: fedora:42
+
+unit_test linux/fedora/42/amd64/clang:
+  <<: *test_linux_fedora_clang
+  image: fedora:42
+  dependencies:
+    - build linux/fedora/42/amd64/clang
+  needs:
+    - build linux/fedora/42/amd64/clang
+
 #-------------------------------------------------------------------------------
 # Python Module
 #-------------------------------------------------------------------------------
@@ -314,7 +290,7 @@ build python/linux/amd64:
   stage: build
   tags:
     - linux-build
-  image: python:3.12
+  image: python:3.13
   services:
     - name: docker:dind
       entrypoint: ["env", "-u", "DOCKER_HOST"]
@@ -384,7 +360,7 @@ deploy python/pypi:
     TWINE_PASSWORD: $PYPI_TOKEN
   tags:
     - linux-build
-  image: python:3.12
+  image: python:3.13
   rules:
     - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
   script:
diff --git a/disk/vsa/vsa08.cpp b/disk/vsa/vsa08.cpp
index acfedd9..aa1c381 100644
--- a/disk/vsa/vsa08.cpp
+++ b/disk/vsa/vsa08.cpp
@@ -7,7 +7,7 @@ VSA08::VSA08(uint8_t* const recordBytes)
 {
 	setType(VSA::Type::AA08);
 	troubleSramCount.insert(troubleSramCount.end(), recordBytes + 2, recordBytes + 6);
-	troubleSectors.insert(troubleSectors.end(), reinterpret_cast<uint32_t*>(recordBytes + 6), reinterpret_cast<uint32_t*>(recordBytes + 20));
+	troubleSectors.insert(troubleSectors.end(), reinterpret_cast<uint32_t*>(recordBytes + 6), reinterpret_cast<uint32_t*>(recordBytes + 22));
 	timestamp = *reinterpret_cast<uint64_t*>(recordBytes + 22) & UINT63_MAX;
 	checksum = *reinterpret_cast<uint16_t*>(recordBytes + 30);
 	doChecksum(recordBytes);