diff --git a/Common/Extensions/NSManagedObject+Conveniences.swift b/Common/Extensions/NSManagedObject+Conveniences.swift
index ca6324a..7084bee 100644
--- a/Common/Extensions/NSManagedObject+Conveniences.swift
+++ b/Common/Extensions/NSManagedObject+Conveniences.swift
@@ -52,7 +52,7 @@ extension NSManagedObject
         }
         catch let error as NSError
         {
-            print("Error loading", predicate, error)
+            print("Error loading", predicate as Any, error)
         }
         
         return results
diff --git a/Cores/DeltaCore b/Cores/DeltaCore
index 1e08e32..b2af08a 160000
--- a/Cores/DeltaCore
+++ b/Cores/DeltaCore
@@ -1 +1 @@
-Subproject commit 1e08e323158f4b5c5d8479ab5a2b7573d9c61e6f
+Subproject commit b2af08a2db9e371b4fcfd8aa52b5106407af7c09
diff --git a/Cores/GBADeltaCore b/Cores/GBADeltaCore
index 29b9929..3dd926d 160000
--- a/Cores/GBADeltaCore
+++ b/Cores/GBADeltaCore
@@ -1 +1 @@
-Subproject commit 29b9929d45d906590a332c0c32f377466485727d
+Subproject commit 3dd926df853e533bbe4e962ee4e20d42bdf681da
diff --git a/Cores/SNESDeltaCore b/Cores/SNESDeltaCore
index fc4c0f0..6f109bf 160000
--- a/Cores/SNESDeltaCore
+++ b/Cores/SNESDeltaCore
@@ -1 +1 @@
-Subproject commit fc4c0f0a4623ce9b561227c3d842647a716d32b9
+Subproject commit 6f109bffc331a1c6f68eee436eb5b1a2c6ac3f60
diff --git a/Delta.xcodeproj/project.pbxproj b/Delta.xcodeproj/project.pbxproj
index 32276e6..e4fea23 100644
--- a/Delta.xcodeproj/project.pbxproj
+++ b/Delta.xcodeproj/project.pbxproj
@@ -565,7 +565,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0700;
-				LastUpgradeCheck = 0800;
+				LastUpgradeCheck = 0810;
 				ORGANIZATIONNAME = "Riley Testut";
 				TargetAttributes = {
 					BFFA71D61AAC406100EE9DD1 = {
@@ -787,8 +787,10 @@
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
@@ -834,8 +836,10 @@
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
diff --git a/Delta.xcodeproj/xcshareddata/xcschemes/Delta.xcscheme b/Delta.xcodeproj/xcshareddata/xcschemes/Delta.xcscheme
index 1d7c447..c27ef0f 100644
--- a/Delta.xcodeproj/xcshareddata/xcschemes/Delta.xcscheme
+++ b/Delta.xcodeproj/xcshareddata/xcschemes/Delta.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0800"
+   LastUpgradeVersion = "0810"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "NO"
diff --git a/Delta/Extensions/EmulatorCore+Cheats.swift b/Delta/Extensions/EmulatorCore+Cheats.swift
index 54c30af..3a15b36 100644
--- a/Delta/Extensions/EmulatorCore+Cheats.swift
+++ b/Delta/Extensions/EmulatorCore+Cheats.swift
@@ -18,11 +18,11 @@ extension EmulatorCore
         }
         catch EmulatorCore.CheatError.invalid
         {
-            print("Invalid cheat:", cheat.name, cheat.code)
+            print("Invalid cheat:", cheat.name ?? "Unnamed Cheat", cheat.code)
         }
         catch
         {
-            print("Unknown Cheat Error:", error, cheat.name, cheat.code)
+            print("Unknown Cheat Error:", error, cheat.name ?? "Unnamed Cheat", cheat.code)
         }
     }
     
diff --git a/External/Roxas b/External/Roxas
index 687755f..4ceaf19 160000
--- a/External/Roxas
+++ b/External/Roxas
@@ -1 +1 @@
-Subproject commit 687755f0b3ad425e9f0ffb36b3310f24bf72ce02
+Subproject commit 4ceaf192ac161e04adf4a1b6ab964ddf689367b4