diff --git a/src/Cloud/CloudDBCommon.cpp b/src/Cloud/CloudDBCommon.cpp
index 1c924c0ca..5f0e95683 100644
--- a/src/Cloud/CloudDBCommon.cpp
+++ b/src/Cloud/CloudDBCommon.cpp
@@ -482,8 +482,8 @@ CloudDBHeader::getAllCachedHeader(QList<CommonAPIHeaderV1> *objectHeader, CloudD
     QMutableListIterator<CommonAPIHeaderV1> it(*objectHeader);
     while (it.hasNext()) {
         CommonAPIHeaderV1 header = it.next();
-        if (header.Id > 0 && updatedIds.contains(header.Id) ||
-            header.Key.size() > 0 && updatedStringIds.contains(header.Key)) {
+        if ((header.Id > 0 && updatedIds.contains(header.Id)) ||
+            (header.Key.size() > 0 && updatedStringIds.contains(header.Key))) {
             // update cache (Header Cache)
             it.remove();
         }
diff --git a/src/Train/ErgFile.cpp b/src/Train/ErgFile.cpp
index 9a4d915ca..a109a859b 100644
--- a/src/Train/ErgFile.cpp
+++ b/src/Train/ErgFile.cpp
@@ -50,7 +50,7 @@ bool ErgFile::isWorkout(QString name)
     return false;
 }
 ErgFile::ErgFile(QString filename, int mode, Context *context) :
-    filename(filename), context(context), mode(mode)
+    filename(filename), mode(mode), context(context)
 {
     if (context->athlete->zones(false)) {
         int zonerange = context->athlete->zones(false)->whichRange(QDateTime::currentDateTime().date());
@@ -59,7 +59,7 @@ ErgFile::ErgFile(QString filename, int mode, Context *context) :
     reload();
 }
 
-ErgFile::ErgFile(Context *context) : context(context), mode(nomode)
+ErgFile::ErgFile(Context *context) : mode(nomode), context(context)
 {
     if (context->athlete->zones(false)) {
         int zonerange = context->athlete->zones(false)->whichRange(QDateTime::currentDateTime().date());
diff --git a/src/Train/VideoWindow.cpp b/src/Train/VideoWindow.cpp
index 43fa65ffd..6b5d88230 100644
--- a/src/Train/VideoWindow.cpp
+++ b/src/Train/VideoWindow.cpp
@@ -45,7 +45,10 @@ VideoWindow::VideoWindow(Context *context)  :
     //
 #ifndef Q_CC_MSVC
 #if QT_VERSION >= 0x050000
-#warning "WARNING: Please ensure the VLC QT4 plugin (gui/libqt4_plugin) is NOT available as it will cause GC to crash."
+// we no longer warn here since it is a runtime issue, on some Ubuntu platforms
+// the VLC plugin cache is out of date and needs refreshing with the command:
+// $ sudo /usr/lib/vlc/vlc-cache-gen -f /usr/lib/vlc/plugins/
+// #warning "WARNING: Please ensure the VLC QT4 plugin (gui/libqt4_plugin) is NOT available as it will cause GC to crash."
 #endif
 #endif