diff --git a/P3D/Entites/Enviroment/ApricornPlant.vb b/P3D/Entites/Enviroment/ApricornPlant.vb
index 2b6ba6c84..ac207358d 100644
--- a/P3D/Entites/Enviroment/ApricornPlant.vb
+++ b/P3D/Entites/Enviroment/ApricornPlant.vb
@@ -67,7 +67,7 @@
 
                             Dim PickDate As Date = New Date(CInt(d(0)), CInt(d(1)), CInt(d(2)), CInt(d(3)), CInt(d(4)), CInt(d(5)))
 
-                            Dim diff As Integer = (Date.Now - PickDate).Hours
+                            Dim diff As Integer = CInt((Date.Now - PickDate).TotalHours)
 
                             Dim hasToDiff As Integer = 24
                             If P3D.World.CurrentSeason = P3D.World.Seasons.Winter Or P3D.World.CurrentSeason = P3D.World.Seasons.Fall Then
diff --git a/P3D/Entites/Enviroment/BerryPlant.vb b/P3D/Entites/Enviroment/BerryPlant.vb
index 06ce7e9f5..79cde46a2 100644
--- a/P3D/Entites/Enviroment/BerryPlant.vb
+++ b/P3D/Entites/Enviroment/BerryPlant.vb
@@ -38,7 +38,7 @@
         Me.CreateWorldEveryFrame = True
     End Sub
 
-    Private Sub InitBerry(ByVal oldDate As String)
+     Private Sub InitBerry(ByVal oldDate As String)
         Dim Data() As String = oldDate.Split(CChar(","))
         Dim d As New Date(CInt(Data(0)), CInt(Data(1)), CInt(Data(2)), CInt(Data(3)), CInt(Data(4)), CInt(Data(5)))
 
@@ -48,7 +48,7 @@
             NewTexture()
         Else
             With My.Computer.Clock.LocalTime
-                Dim diff As Integer = (Date.Now - d).Seconds
+                Dim diff As Integer = CInt((Date.Now - d).TotalSeconds)
 
                 Grow += diff
 
diff --git a/P3D/Network/GameJolt/GameJoltStatistics.vb b/P3D/Network/GameJolt/GameJoltStatistics.vb
index ee89ec8f3..f5037e7ec 100644
--- a/P3D/Network/GameJolt/GameJoltStatistics.vb
+++ b/P3D/Network/GameJolt/GameJoltStatistics.vb
@@ -32,7 +32,7 @@
             If IndicedStats.Contains(statName.ToLower()) = False Then
                 If statName.ToLower() = "steps taken" Then
                     TempSteps += 1
-                    If (Date.Now - lastStepTime).Seconds >= 20 Then
+                    If CInt((Date.Now - lastStepTime).TotalSeconds) >= 20 Then
                         lastStepTime = Date.Now
                         Return True
                     End If
diff --git a/P3D/Network/GameJolt/SessionManager.vb b/P3D/Network/GameJolt/SessionManager.vb
index 33a727f4f..a270e69c8 100644
--- a/P3D/Network/GameJolt/SessionManager.vb
+++ b/P3D/Network/GameJolt/SessionManager.vb
@@ -28,7 +28,7 @@
         End Sub
 
         Shared Sub Ping()
-            Dim diff As Integer = (Date.Now - LastPing).Seconds
+            Dim diff As Integer = CInt((Date.Now - LastPing).TotalSeconds)
 
             If diff >= 30 Then
                 Logger.Debug("Ping session...")
diff --git a/P3D/Screens/Inventory/ApricornScreen.vb b/P3D/Screens/Inventory/ApricornScreen.vb
index f738a8ff4..d1e721a6c 100644
--- a/P3D/Screens/Inventory/ApricornScreen.vb
+++ b/P3D/Screens/Inventory/ApricornScreen.vb
@@ -419,7 +419,7 @@
                         Dim d() As String = ApricornData(2).Split(CChar(","))
                         Dim gaveDate As Date = New Date(CInt(d(0)), CInt(d(1)), CInt(d(2)), CInt(d(3)), CInt(d(4)), CInt(d(5)))
 
-                        diff = (Date.Now - gaveDate).Minutes
+                        diff = CInt((Date.Now - gaveDate).TotalMinutes)
                     End If
                 End If
             Next
diff --git a/P3D/World/ActionScript/ActionScript.vb b/P3D/World/ActionScript/ActionScript.vb
index fefd18ba8..87230580e 100644
--- a/P3D/World/ActionScript/ActionScript.vb
+++ b/P3D/World/ActionScript/ActionScript.vb
@@ -375,15 +375,15 @@ nextScript:
                         Dim diff = date1 - date2
                         Select Case format
                             Case "days", "day"
-                                If diff.Days >= value Then
+                                If CInt(diff.TotalDays) >= value Then
                                     remove = True
                                 End If
                             Case "minutes", "minute"
-                                If diff.Minutes >= value Then
+                                If CInt(diff.TotalMinutes) >= value Then
                                     remove = True
                                 End If
                             Case "seconds", "second"
-                                If diff.Seconds >= value Then
+                                If CInt(diff.TotalSeconds) >= value Then
                                     remove = True
                                 End If
                             Case "years", "year"
@@ -399,7 +399,7 @@ nextScript:
                                     remove = True
                                 End If
                             Case "hours", "hour"
-                                If diff.Hours >= value Then
+                                If CInt(diff.TotalHours) >= value Then
                                     remove = True
                                 End If
                             Case "dayofweek"
diff --git a/lib/build/Pokemon3D.exe b/lib/build/Pokemon3D.exe
index dc5a37339..d66c69a9e 100644
Binary files a/lib/build/Pokemon3D.exe and b/lib/build/Pokemon3D.exe differ