diff --git a/MareSynchronos/FileCache/FileCacheManager.cs b/MareSynchronos/FileCache/FileCacheManager.cs
index bc5b5c1..bd303bc 100644
--- a/MareSynchronos/FileCache/FileCacheManager.cs
+++ b/MareSynchronos/FileCache/FileCacheManager.cs
@@ -195,7 +195,7 @@ public sealed class FileCacheManager : IDisposable
             }
             else
             {
-                result.Add(entry.Key, null);
+                result.Add(entry.Key, CreateFileEntry(entry.Key));
             }
         }
 
diff --git a/MareSynchronos/Services/Mediator/MareMediator.cs b/MareSynchronos/Services/Mediator/MareMediator.cs
index dddc676..4b421d1 100644
--- a/MareSynchronos/Services/Mediator/MareMediator.cs
+++ b/MareSynchronos/Services/Mediator/MareMediator.cs
@@ -150,7 +150,7 @@ public sealed class MareMediator : IHostedService
                 if (_lastErrorTime.TryGetValue(subscriber, out var lastErrorTime) && lastErrorTime.Add(TimeSpan.FromSeconds(10)) > DateTime.UtcNow)
                     continue;
 
-                _logger.LogCritical(ex, "Error executing {type} for subscriber {subscriber}", message.GetType().Name, subscriber.Subscriber.GetType().Name);
+                _logger.LogError(ex.InnerException ?? ex, "Error executing {type} for subscriber {subscriber}", message.GetType().Name, subscriber.Subscriber.GetType().Name);
                 _lastErrorTime[subscriber] = DateTime.UtcNow;
             }
         }
diff --git a/MareSynchronos/Services/PerformanceCollectorService.cs b/MareSynchronos/Services/PerformanceCollectorService.cs
index 0afaef1..6f2be36 100644
--- a/MareSynchronos/Services/PerformanceCollectorService.cs
+++ b/MareSynchronos/Services/PerformanceCollectorService.cs
@@ -173,7 +173,7 @@ public sealed class PerformanceCollectorService : IHostedService
             {
                 try
                 {
-                    var last = entries.Value.ToList()[^1];
+                    var last = entries.Value.Last();
                     if (last.Item1.AddMinutes(10) < TimeOnly.FromDateTime(DateTime.Now) && !_performanceCounters.TryRemove(entries.Key, out _))
                     {
                         _logger.LogDebug("Could not remove performance counter {counter}", entries.Key);