diff --git a/DataStructures/Rectangle.h b/DataStructures/Rectangle.h
index 0c3e4a607..7cbd31504 100644
--- a/DataStructures/Rectangle.h
+++ b/DataStructures/Rectangle.h
@@ -56,7 +56,7 @@ struct RectangleInt2D
         const bool is_contained = Contains(location);
         if (is_contained)
         {
-            return 0.;
+            return 0.0f;
         }
 
         enum Direction
diff --git a/Util/TimingUtil.h b/Util/TimingUtil.h
index a0cc67e0b..5f16ff7ca 100644
--- a/Util/TimingUtil.h
+++ b/Util/TimingUtil.h
@@ -28,15 +28,16 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef TIMINGUTIL_H
 #define TIMINGUTIL_H
 
-#include <chrono>
 #include <atomic>
+#include <chrono>
+#include <cstdint>
 #include <mutex>
 #include <unordered_map>
 
 struct GlobalTimer
 {
     GlobalTimer() : time(0) {}
-    std::atomic<long unsigned> time;
+    std::atomic<uint64_t> time;
 };
 
 class GlobalTimerFactory