diff --git a/Sources/XcodeGenKit/PBXProjGenerator.swift b/Sources/XcodeGenKit/PBXProjGenerator.swift
index ee89c525..16002fe1 100644
--- a/Sources/XcodeGenKit/PBXProjGenerator.swift
+++ b/Sources/XcodeGenKit/PBXProjGenerator.swift
@@ -288,7 +288,7 @@ public class PBXProjGenerator {
             }
             .sorted { child1, child2 in
                 if child1.object.sortOrder == child2.object.sortOrder {
-                    return child1.object.nameOrPath < child2.object.nameOrPath
+                    return child1.object.nameOrPath.localizedStandardCompare(child2.object.nameOrPath) == .orderedAscending
                 } else {
                     return child1.object.sortOrder < child2.object.sortOrder
                 }
diff --git a/Sources/XcodeGenKit/SourceGenerator.swift b/Sources/XcodeGenKit/SourceGenerator.swift
index 6bddb3e0..5ded8d71 100644
--- a/Sources/XcodeGenKit/SourceGenerator.swift
+++ b/Sources/XcodeGenKit/SourceGenerator.swift
@@ -119,7 +119,7 @@ class SourceGenerator {
                 let models = (try? path.children()) ?? []
                 let modelFileReference = models
                     .filter { $0.extension == "xcdatamodel" }
-                    .sorted()
+                    .sorted { $0.string.localizedStandardCompare($1.string) == .orderedAscending }
                     .map { path in
                         createObject(
                             id: path.byRemovingBase(path: project.basePath).string,
@@ -131,7 +131,7 @@ class SourceGenerator {
                         )
                     }
                 let versionGroup = addObject(id: fileReferencePath.string, XCVersionGroup(
-                    currentVersion: modelFileReference.first?.reference,
+                    currentVersion: modelFileReference.last?.reference,
                     path: fileReferencePath.string,
                     sourceTree: sourceTree,
                     versionGroupType: "wrapper.xcdatamodel",