diff --git a/FinlyticBackend/Controllers/AnalyzeController.cs b/FinlyticBackend/Controllers/AnalyzeController.cs
index db4c4b9..25f9316 100644
--- a/FinlyticBackend/Controllers/AnalyzeController.cs
+++ b/FinlyticBackend/Controllers/AnalyzeController.cs
@@ -83,9 +83,7 @@ public class AnalyzeController : ControllerBase
             var sentData = await sentTask;
 
             decimal lastCandlePrice = taData?.Candles != null && taData.Candles.Count > 0 ? (decimal)taData.Candles.Last().Close : 0m;
-            decimal resolvedPrice = request.CurrentPrice ?? 
-                (lastCandlePrice > 0 ? lastCandlePrice : 
-                (fundData != null && fundData.CurrentPrice > 0 ? fundData.CurrentPrice : 100.0m));
+            decimal resolvedPrice = request.CurrentPrice ?? (lastCandlePrice > 0 ? lastCandlePrice : 100.0m);
 
             var rpcRequest = new ManualAnalysisRpcRequest(
                 Isin: targetIsin,
diff --git a/FinlyticBackend/Controllers/CalendarController.cs b/FinlyticBackend/Controllers/CalendarController.cs
index 0ad3d84..d9e7a56 100644
--- a/FinlyticBackend/Controllers/CalendarController.cs
+++ b/FinlyticBackend/Controllers/CalendarController.cs
@@ -65,7 +65,7 @@ public class CalendarController : ControllerBase
                     var parsedEvents = rawEvents.Select(e =>
                     {
                         string eventIsin = e.Isin ?? string.Empty;
-                        string ticker = e.Ticker ?? string.Empty;
+                        string ticker = e.Ticker?.Ticker ?? string.Empty;
                         string companyName = e.CompanyName ?? string.Empty;
                         string eventType = e.EventType ?? string.Empty;
                         DateTime eventDate = e.Date;