diff --git a/src/gs-manager.c b/src/gs-manager.c
index 55761a4..debffc6 100644
--- a/src/gs-manager.c
+++ b/src/gs-manager.c
@@ -350,7 +350,7 @@ add_lock_timer (GSManager *manager,
         return;
 
     gs_debug ("Scheduling screen lock after screensaver is idling for %i sec", timeout);
-    manager->priv->lock_timeout_id = g_timeout_add (timeout * 60000,
+    manager->priv->lock_timeout_id = g_timeout_add_seconds (timeout * 60,
                                                     (GSourceFunc)activate_lock_timeout,
                                                     manager);
 }
@@ -414,7 +414,7 @@ remove_cycle_timer (GSManager *manager) {
 static void
 add_cycle_timer (GSManager *manager,
                  glong      timeout) {
-    manager->priv->cycle_timeout_id = g_timeout_add (timeout,
+    manager->priv->cycle_timeout_id = g_timeout_add_seconds (timeout,
                                                      (GSourceFunc)cycle_timeout,
                                                      manager);
 }
@@ -596,7 +596,7 @@ add_dpms_timer (GSManager *manager,
         return;
 
     gs_debug ("Scheduling DPMS change after screensaver is idling for %i minute(s)", timeout);
-    manager->priv->dpms_timeout_id = g_timeout_add (timeout * 60000,
+    manager->priv->dpms_timeout_id = g_timeout_add_seconds (timeout * 60,
                                                     (GSourceFunc)activate_dpms_timeout,
                                                     manager);
 }
@@ -777,7 +777,7 @@ deepsleep_idle (GSManager *manager) {
 static void
 add_deepsleep_idle (GSManager *manager) {
     remove_deepsleep_idle(manager);
-    manager->priv->deepsleep_idle_id = g_timeout_add (15000, (GSourceFunc)deepsleep_idle, manager);
+    manager->priv->deepsleep_idle_id = g_timeout_add_seconds (15, (GSourceFunc)deepsleep_idle, manager);
 }
 
 static gboolean
@@ -802,7 +802,7 @@ manager_show_window (GSManager *manager,
     remove_lock_timer (manager);
     add_lock_timer (manager, manager->priv->prefs->lock_timeout);
 
-    if (manager->priv->prefs->cycle >= 10000) {
+    if (manager->priv->prefs->cycle >= 10) {
         remove_cycle_timer (manager);
         add_cycle_timer (manager, manager->priv->prefs->cycle);
     }
@@ -1270,6 +1270,10 @@ gs_manager_activate (GSManager *manager) {
     windows = add_overlays (manager);
 
     show_windows (manager->priv->windows);
+    if (manager->priv->prefs->mode == GS_MODE_BLANK_ONLY) {
+        remove_dpms_timer(manager);
+        manager->priv->dpms_timeout_id = g_timeout_add_seconds (1, (GSourceFunc)activate_dpms_timeout, manager);
+    }
 
     g_timeout_add (2000,
                    (GSourceFunc)remove_overlays,
diff --git a/src/gs-prefs.c b/src/gs-prefs.c
index 74b0d93..3a7365c 100644
--- a/src/gs-prefs.c
+++ b/src/gs-prefs.c
@@ -141,7 +141,7 @@ _gs_prefs_set_cycle_timeout (GSPrefs *prefs,
     if (value > 480)
         value = 480;
 
-    prefs->cycle = value * 60000;
+    prefs->cycle = value * 60;
 }
 
 static void
@@ -603,7 +603,7 @@ gs_prefs_init (GSPrefs *prefs) {
     prefs->timeout                  = 600000;
     prefs->lock_timeout             = 0;
     prefs->logout_timeout           = 14400000;
-    prefs->cycle                    = 600000;
+    prefs->cycle                    = 600;
 
     prefs->mode                     = GS_MODE_SINGLE;