diff --git a/MPF.Library/Aaru/Parameters.cs b/MPF.Library/Aaru/Parameters.cs
index 0522445c..03f6219e 100644
--- a/MPF.Library/Aaru/Parameters.cs
+++ b/MPF.Library/Aaru/Parameters.cs
@@ -1695,11 +1695,11 @@ namespace MPF.Aaru
             if (File.Exists(basePath + ".cicm.xml"))
                 info.Artifacts["cicm"] = GetBase64(GetFullFile(basePath + ".cicm.xml"));
             if (File.Exists(basePath + ".ibg"))
-                info.Artifacts["ibg"] = GetBase64(GetFullFile(basePath + ".ibg", binary: true));
+                info.Artifacts["ibg"] = Convert.ToBase64String(File.ReadAllBytes(basePath + ".ibg"));
             if (File.Exists(basePath + ".log"))
                 info.Artifacts["log"] = GetBase64(GetFullFile(basePath + ".log"));
             if (File.Exists(basePath + ".mhddlog.bin"))
-                info.Artifacts["mhddlog_bin"] = GetBase64(GetFullFile(basePath + ".mhddlog.bin", binary: true));
+                info.Artifacts["mhddlog_bin"] = Convert.ToBase64String(File.ReadAllBytes(basePath + ".mhddlog.bin"));
             if (File.Exists(basePath + ".resume.xml"))
                 info.Artifacts["resume"] = GetBase64(GetFullFile(basePath + ".resume.xml"));
             if (File.Exists(basePath + ".sub.log"))
diff --git a/MPF.Library/DiscImageCreator/Parameters.cs b/MPF.Library/DiscImageCreator/Parameters.cs
index 2b2e5047..0da5bd1e 100644
--- a/MPF.Library/DiscImageCreator/Parameters.cs
+++ b/MPF.Library/DiscImageCreator/Parameters.cs
@@ -2201,7 +2201,7 @@ namespace MPF.DiscImageCreator
 
             // Fill in any artifacts that exist, Base64-encoded
             if (File.Exists(basePath + ".c2"))
-                info.Artifacts["c2"] = GetBase64(GetFullFile(basePath + ".c2", binary: true));
+                info.Artifacts["c2"] = Convert.ToBase64String(File.ReadAllBytes(basePath + ".c2"));
             if (File.Exists(basePath + "_c2Error.txt"))
                 info.Artifacts["c2Error"] = GetBase64(GetFullFile(basePath + "_c2Error.txt"));
             if (File.Exists(basePath + ".ccd"))
@@ -2215,7 +2215,7 @@ namespace MPF.DiscImageCreator
             if (File.Exists(basePath + "_disc.txt"))
                 info.Artifacts["disc"] = GetBase64(GetFullFile(basePath + "_disc.txt"));
             //if (File.Exists(Path.Combine(outputDirectory, "DMI.bin")))
-            //    info.Artifacts["dmi"] = GetBase64(GetFullFile(Path.Combine(outputDirectory, "DMI.bin"), binary: true));
+            //    info.Artifacts["dmi"] = Convert.ToBase64String(File.ReadAllBytes(Path.Combine(outputDirectory, "DMI.bin")));
             if (File.Exists(basePath + "_drive.txt"))
                 info.Artifacts["drive"] = GetBase64(GetFullFile(basePath + "_drive.txt"));
             if (File.Exists(basePath + "_img.cue"))
@@ -2229,11 +2229,11 @@ namespace MPF.DiscImageCreator
             if (File.Exists(basePath + "_mainInfo.txt"))
                 info.Artifacts["mainInfo"] = GetBase64(GetFullFile(basePath + "_mainInfo.txt"));
             //if (File.Exists(Path.Combine(outputDirectory, "PFI.bin")))
-            //    info.Artifacts["pfi"] = GetBase64(GetFullFile(Path.Combine(outputDirectory, "PFI.bin"), binary: true));
+            //    info.Artifacts["pfi"] = Convert.ToBase64String(File.ReadAllBytes(Path.Combine(outputDirectory, "PFI.bin")));
             //if (File.Exists(Path.Combine(outputDirectory, "SS.bin")))
-            //    info.Artifacts["ss"] = GetBase64(GetFullFile(Path.Combine(outputDirectory, "SS.bin"), binary: true));
+            //    info.Artifacts["ss"] = Convert.ToBase64String(File.ReadAllBytes(Path.Combine(outputDirectory, "SS.bin")));
             if (File.Exists(basePath + ".sub"))
-                info.Artifacts["sub"] = GetBase64(GetFullFile(basePath + ".sub", binary: true));
+                info.Artifacts["sub"] = Convert.ToBase64String(File.ReadAllBytes(basePath + ".sub"));
             if (File.Exists(basePath + "_subError.txt"))
                 info.Artifacts["subError"] = GetBase64(GetFullFile(basePath + "_subError.txt"));
             if (File.Exists(basePath + "_subInfo.txt"))