diff --git a/Sources/apk/Index/ApkIndex.swift b/Sources/apk/Index/ApkIndex.swift
index aa1fbbd..6c1dc47 100644
--- a/Sources/apk/Index/ApkIndex.swift
+++ b/Sources/apk/Index/ApkIndex.swift
@@ -20,7 +20,7 @@ public extension ApkIndex {
     Self.init(packages: tables.flatMap(\.packages))
   }
 
-  static func merge(_ tables: Self...) -> ApkIndex {
+  static func merge(_ tables: Self...) -> Self {
     Self.init(packages: tables.flatMap(\.packages))
   }
 }
diff --git a/Sources/apk/Index/ApkIndexDependency.swift b/Sources/apk/Index/ApkIndexDependency.swift
index 866b400..85c14e2 100644
--- a/Sources/apk/Index/ApkIndexDependency.swift
+++ b/Sources/apk/Index/ApkIndexDependency.swift
@@ -3,8 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import Foundation
-
 public struct ApkIndexDependency: Hashable, Sendable {
   let requirement: ApkVersionRequirement
 
diff --git a/Sources/apk/Index/ApkIndexPackage.swift b/Sources/apk/Index/ApkIndexPackage.swift
index cbdc7f9..3033aa6 100644
--- a/Sources/apk/Index/ApkIndexPackage.swift
+++ b/Sources/apk/Index/ApkIndexPackage.swift
@@ -26,9 +26,6 @@ public struct ApkIndexPackage: Hashable, Sendable {
 
   public var downloadFilename: String { "\(self.name)-\(version).apk" }
 
-  //TODO: Implementation
-  //lazy var semanticVersion: (Int, Int, Int) = (0, 0, 0)
-
   init(name: String, version spec: ApkVersionSpecification) {
     fatalError("Cannot construct an ApkIndexPackage this way")
   }
diff --git a/Sources/apk/Utility/TextFileWriter.swift b/Sources/apk/Utility/TextFileWriter.swift
index 0a3d1a4..68e1b95 100644
--- a/Sources/apk/Utility/TextFileWriter.swift
+++ b/Sources/apk/Utility/TextFileWriter.swift
@@ -4,6 +4,7 @@
  */
 
 import Foundation
+import Darwin
 
 struct TextFileWriter: TextOutputStream {
   private var _hnd: FileHandle