diff --git a/oscar/SleepLib/day.cpp b/oscar/SleepLib/day.cpp
index 4fb68689..eb7419cb 100644
--- a/oscar/SleepLib/day.cpp
+++ b/oscar/SleepLib/day.cpp
@@ -128,7 +128,8 @@ void Day::addSession(Session *s)
         if (sess->session() == s->session() && sess->type() == s->type()) {
             // This usually indicates a problem in purging or cleanup somewhere,
             // unless there's a problem with a parser.
-            qCritical() << "Day object" << this->date().toString() << "adding duplicate session" << s->session();
+            qCritical() << "Day object" << this->date().toString() << "adding duplicate session" << s->session()
+                     << "["+QDateTime::fromTime_t(s->session()).toString("MMM dd, yyyy hh:mm:ss")+"]";
             // Don't skip this one, since it might have replaced the original elsewhere already.
             //return;
         }
diff --git a/oscar/SleepLib/machine.cpp b/oscar/SleepLib/machine.cpp
index 3de4eca1..e765d9f5 100644
--- a/oscar/SleepLib/machine.cpp
+++ b/oscar/SleepLib/machine.cpp
@@ -331,8 +331,8 @@ bool Machine::AddSession(Session *s)
 
     int ignore_sessions = profile->session->ignoreShortSessions();
 
-    int session_length = s->last() - s->first();
-    session_length /= 60000;
+    qint64 session_length = s->last() - s->first();
+    session_length /= 60000L;
 
     sessionlist[s->session()] = s; // To make sure it get's saved later even if it's not wanted.
 
@@ -386,7 +386,8 @@ bool Machine::AddSession(Session *s)
 
     if (session_length < ignore_sessions) {
         // keep the session to save importing it again, but don't add it to the day record this time
-        qDebug() << s->session() << "Ignoring short session";
+        qDebug() << s->session() << "Ignoring short session <" << ignore_sessions
+            << "["+QDateTime::fromTime_t(s->session()).toString("MMM dd, yyyy hh:mm:ss")+"]";
         return true;
     }