diff --git a/src/dtgtk/range.c b/src/dtgtk/range.c
index e359d431d64b..662668398bee 100644
--- a/src/dtgtk/range.c
+++ b/src/dtgtk/range.c
@@ -225,7 +225,7 @@ static gchar *_default_print_date_func(const double value, const gboolean detail
 }
 static gboolean _default_decode_date_func(const gchar *text, double *value)
 {
-  long val = dt_datetime_exif_to_gtimespan(text);
+  GTimeSpan val = dt_datetime_exif_to_gtimespan(text);
   if(val > 0)
   {
     *value = val;
@@ -1748,7 +1748,7 @@ GtkWidget *dtgtk_range_select_new(const gchar *property, const gboolean show_ent
   DT_DEBUG_CONTROL_SIGNAL_CONNECT(darktable.signals, DT_SIGNAL_PREFERENCES_CHANGE, G_CALLBACK(_dt_pref_changed),
                                   range);
   gtk_widget_set_name((GtkWidget *)range, "dt-range");
-  
+
   return (GtkWidget *)range;
 }
 
diff --git a/src/libs/filters/date.c b/src/libs/filters/date.c
index 6b4093c30ad2..4716a2c60623 100644
--- a/src/libs/filters/date.c
+++ b/src/libs/filters/date.c
@@ -67,7 +67,7 @@ static gboolean _date_update(dt_lib_filtering_rule_t *rule)
   while(sqlite3_step(stmt) == SQLITE_ROW)
   {
     const int count = sqlite3_column_int(stmt, 1);
-    const long dt = sqlite3_column_int64(stmt, 0);
+    const int64_t dt = sqlite3_column_int64(stmt, 0);
     dtgtk_range_select_add_block(range, dt, count);
     if(rangetop) dtgtk_range_select_add_block(rangetop, dt, count);
   }