diff --git a/Delta/Emulation/GameViewController.swift b/Delta/Emulation/GameViewController.swift
index 120f844..217d919 100644
--- a/Delta/Emulation/GameViewController.swift
+++ b/Delta/Emulation/GameViewController.swift
@@ -222,7 +222,7 @@ extension GameViewController
             
             if let game = self.game
             {
-                let fileURL = FileManager.uniqueTemporaryURL()
+                let fileURL = FileManager.default.uniqueTemporaryURL()
                 self.pausedSaveState = PausedSaveState(fileURL: fileURL, gameType: game.type)
                 
                 self.emulatorCore?.saveSaveState(to: fileURL)
@@ -551,7 +551,7 @@ extension GameViewController: SaveStatesViewControllerDelegate
         
         if let autoSaveState = saveState as? SaveState, autoSaveState.type == .auto
         {
-            let temporaryURL = FileManager.uniqueTemporaryURL()
+            let temporaryURL = FileManager.default.uniqueTemporaryURL()
             
             do
             {
diff --git a/Delta/Game Selection/GameCollectionViewController.swift b/Delta/Game Selection/GameCollectionViewController.swift
index aa8e1a7..d43bea2 100644
--- a/Delta/Game Selection/GameCollectionViewController.swift	
+++ b/Delta/Game Selection/GameCollectionViewController.swift	
@@ -448,7 +448,7 @@ extension GameCollectionViewController: UIViewControllerPreviewingDelegate
         let indexPath = self.dataSource.fetchedResultsController.indexPath(forObject: game)!
         let cell = self.collectionView?.cellForItem(at: indexPath)
         
-        let fileURL = FileManager.uniqueTemporaryURL()
+        let fileURL = FileManager.default.uniqueTemporaryURL()
         self.activeSaveState = gameViewController.emulatorCore?.saveSaveState(to: fileURL)
         
         gameViewController.emulatorCore?.stop()
diff --git a/Delta/Importing/Import Options/ClipboardImportOption.swift b/Delta/Importing/Import Options/ClipboardImportOption.swift
index be859b4..6bbfb27 100644
--- a/Delta/Importing/Import Options/ClipboardImportOption.swift	
+++ b/Delta/Importing/Import Options/ClipboardImportOption.swift	
@@ -24,7 +24,7 @@ struct ClipboardImportOption: ImportOption
         
         do
         {
-            let temporaryURL = FileManager.uniqueTemporaryURL()
+            let temporaryURL = FileManager.default.uniqueTemporaryURL()
             try data.write(to: temporaryURL, options: .atomic)
             
             completionHandler([temporaryURL])
diff --git a/Delta/Importing/Import Options/PhotoLibraryImportOption.swift b/Delta/Importing/Import Options/PhotoLibraryImportOption.swift
index 91d5399..51b008e 100644
--- a/Delta/Importing/Import Options/PhotoLibraryImportOption.swift	
+++ b/Delta/Importing/Import Options/PhotoLibraryImportOption.swift	
@@ -48,7 +48,7 @@ extension PhotoLibraryImportOption: UIImagePickerControllerDelegate, UINavigatio
         
         do
         {
-            let temporaryURL = FileManager.uniqueTemporaryURL()
+            let temporaryURL = FileManager.default.uniqueTemporaryURL()
             try data.write(to: temporaryURL, options: .atomic)
             
             self.completionHandler?([temporaryURL])
diff --git a/Delta/Importing/Import Options/iTunesImportOption.swift b/Delta/Importing/Import Options/iTunesImportOption.swift
index 8b6f979..9949a4b 100644
--- a/Delta/Importing/Import Options/iTunesImportOption.swift	
+++ b/Delta/Importing/Import Options/iTunesImportOption.swift	
@@ -40,7 +40,7 @@ struct iTunesImportOption: ImportOption
                 
                 for url in itemURLs
                 {
-                    let destinationURL = FileManager.uniqueTemporaryURL().appendingPathExtension(url.pathExtension)
+                    let destinationURL = FileManager.default.uniqueTemporaryURL().appendingPathExtension(url.pathExtension)
                     
                     do
                     {
diff --git a/Delta/Pause Menu/Save States/SaveStatesViewController.swift b/Delta/Pause Menu/Save States/SaveStatesViewController.swift
index 2503ceb..4844fed 100644
--- a/Delta/Pause Menu/Save States/SaveStatesViewController.swift	
+++ b/Delta/Pause Menu/Save States/SaveStatesViewController.swift	
@@ -555,7 +555,7 @@ extension SaveStatesViewController: UIViewControllerPreviewingDelegate
         
         // Store reference to current game state before we stop emulation so we can resume it if user decides to not load a save state
         
-        let fileURL = FileManager.uniqueTemporaryURL()
+        let fileURL = FileManager.default.uniqueTemporaryURL()
         self.emulatorCoreSaveState = emulatorCore.saveSaveState(to: fileURL)
         
         if self.emulatorCoreSaveState != nil
@@ -593,7 +593,7 @@ extension SaveStatesViewController: UIViewControllerPreviewingDelegate
         let gameViewController = viewControllerToCommit as! PreviewGameViewController        
         gameViewController.emulatorCore?.pause()
         
-        let fileURL = FileManager.uniqueTemporaryURL()
+        let fileURL = FileManager.default.uniqueTemporaryURL()
         if let saveState = gameViewController.emulatorCore?.saveSaveState(to: fileURL)
         {
             gameViewController.emulatorCore?.stop()
diff --git a/External/Roxas b/External/Roxas
index 356ea5d..3ecd5e6 160000
--- a/External/Roxas
+++ b/External/Roxas
@@ -1 +1 @@
-Subproject commit 356ea5d714ee48ddf4a976b89a9579bb7d05b938
+Subproject commit 3ecd5e6e727181d0d1c9984079a809483c247c24