diff --git a/dialogs/preferencesdialog.cpp b/dialogs/preferencesdialog.cpp
index b39a7f8a4..03a2ce45a 100644
--- a/dialogs/preferencesdialog.cpp
+++ b/dialogs/preferencesdialog.cpp
@@ -170,7 +170,7 @@ void PreferencesDialog::delete_previews(PreviewDeleteTypes type) {
 
 void PreferencesDialog::populate_ocio_menus(OCIO::ConstConfigRcPtr config)
 {
-  if (config == nullptr) {
+  if (!config) {
 
     // Just clear everything
     ocio_display->clear();
@@ -230,16 +230,16 @@ void PreferencesDialog::populate_ocio_menus(OCIO::ConstConfigRcPtr config)
 OCIO::ConstConfigRcPtr PreferencesDialog::TestOCIOConfig(const QString &url)
 {
   // Check whether OCIO can load it
+  OCIO::ConstConfigRcPtr config;
   try {
-    OCIO::ConstConfigRcPtr config = OCIO::Config::CreateFromFile(ocio_config_file->text().toUtf8());
-    return config;
+    config = OCIO::Config::CreateFromFile(ocio_config_file->text().toUtf8());
   } catch (OCIO::Exception& e) {
     QMessageBox::critical(this,
                           tr("OpenColorIO Config Error"),
                           tr("Failed to set OpenColorIO configuration: %1").arg(e.what()),
                           QMessageBox::Ok);
-    return nullptr;
   }
+  return config;
 }
 
 void PreferencesDialog::update_ocio_view_menu(OCIO::ConstConfigRcPtr config)
@@ -270,7 +270,7 @@ void PreferencesDialog::update_ocio_view_menu(OCIO::ConstConfigRcPtr config)
 
 void PreferencesDialog::update_ocio_config(const QString &s)
 {
-  OCIO::ConstConfigRcPtr file_config = nullptr;
+  OCIO::ConstConfigRcPtr file_config;
 
   if (!s.isEmpty() && QFileInfo::exists(s)) {
     file_config = TestOCIOConfig(s);
@@ -356,7 +356,7 @@ void PreferencesDialog::accept() {
       // Check whether OCIO can load it
       OCIO::ConstConfigRcPtr file_config = TestOCIOConfig(ocio_config_file->text().toUtf8());
 
-      if (file_config == nullptr) {
+      if (!file_config) {
         return;
       }
 
diff --git a/effects/effect.cpp b/effects/effect.cpp
index bc2592cae..e142ad890 100644
--- a/effects/effect.cpp
+++ b/effects/effect.cpp
@@ -69,6 +69,7 @@
 #include "effects/internal/richtexteffect.h"
 
 QVector<EffectMeta> olive::effects;
+QVector<BlendMode> olive::blend_modes;
 QString olive::generated_blending_shader;
 
 EffectPtr Effect::Create(Clip* c, const EffectMeta* em) {
diff --git a/ui/viewerwindow.h b/ui/viewerwindow.h
index 0da945bee..2f5dec7f7 100644
--- a/ui/viewerwindow.h
+++ b/ui/viewerwindow.h
@@ -25,6 +25,7 @@
 #include <QTimer>
 #include <QMutex>
 #include <QMenu>
+#include <QShortcut>
 
 #include "rendering/qopenglshaderprogramptr.h"