diff --git a/Elwig/Models/AreaComType.cs b/Elwig/Models/AreaComType.cs
index 5043979..e981da9 100644
--- a/Elwig/Models/AreaComType.cs
+++ b/Elwig/Models/AreaComType.cs
@@ -1,3 +1,4 @@
+using Elwig.Helpers;
 using Microsoft.EntityFrameworkCore;
 using System.ComponentModel.DataAnnotations.Schema;
 
@@ -26,12 +27,12 @@ namespace Elwig.Models {
         public int? MaxKgPerHa { get; set; }
 
         [Column("penalty_amount")]
-        public double? PenaltyAmoutValue { get; set; }
+        public long? PenaltyAmoutValue { get; set; }
 
         [NotMapped]
         public decimal? PenaltyAmount {
-            get => PenaltyAmoutValue != null ? (decimal)PenaltyAmoutValue : null;
-            set => PenaltyAmoutValue = value != null ? (double)value : null;
+            get => PenaltyAmoutValue != null ? Utils.DecFromDb(PenaltyAmoutValue.Value, 4) : null;
+            set => PenaltyAmoutValue = value != null ? Utils.DecToDb(value.Value, 4) : null;
         }
 
         [ForeignKey("SortId")]
diff --git a/Elwig/Models/Currency.cs b/Elwig/Models/Currency.cs
index c0981d1..a28bc64 100644
--- a/Elwig/Models/Currency.cs
+++ b/Elwig/Models/Currency.cs
@@ -18,6 +18,6 @@ namespace Elwig.Models {
         public long? OneEuroValue { get; private set; }
 
         [NotMapped]
-        public decimal? OneEuro => OneEuroValue != null ? Utils.DecFromDb((long)OneEuroValue, 6) : null;
+        public decimal? OneEuro => OneEuroValue != null ? Utils.DecFromDb(OneEuroValue.Value, 6) : null;
     }
 }
diff --git a/Elwig/Models/Modifier.cs b/Elwig/Models/Modifier.cs
index 3605268..749e8a1 100644
--- a/Elwig/Models/Modifier.cs
+++ b/Elwig/Models/Modifier.cs
@@ -24,10 +24,10 @@ namespace Elwig.Models {
         [NotMapped]
         public decimal? Abs {
             get {
-                return AbsValue != null ? Season.DecFromDb((long)AbsValue) : null;
+                return AbsValue != null ? Season.DecFromDb(AbsValue.Value) : null;
             }
             set {
-                AbsValue = value != null ? Season.DecToDb((decimal)value) : null;
+                AbsValue = value != null ? Season.DecToDb(value.Value) : null;
             }
         }
 
diff --git a/Elwig/Windows/DeliveryAdminWindow.xaml.cs b/Elwig/Windows/DeliveryAdminWindow.xaml.cs
index 2018261..5be8dee 100644
--- a/Elwig/Windows/DeliveryAdminWindow.xaml.cs
+++ b/Elwig/Windows/DeliveryAdminWindow.xaml.cs
@@ -26,7 +26,7 @@ namespace Elwig.Windows {
         private string? ManualWeighingReason = null;
         private string? ScaleId = null;
         private string? WeighingId = null;
-        private Button[] WeighingButtons;
+        private readonly Button[] WeighingButtons;
 
         public DeliveryAdminWindow(bool receipt = false) {
             InitializeComponent();