diff --git a/app/dialog/preferences/tabs/preferencesdisktab.cpp b/app/dialog/preferences/tabs/preferencesdisktab.cpp
index 6041d19fe..ec1eeefb1 100644
--- a/app/dialog/preferences/tabs/preferencesdisktab.cpp
+++ b/app/dialog/preferences/tabs/preferencesdisktab.cpp
@@ -69,7 +69,7 @@ PreferencesDiskTab::PreferencesDiskTab()
   cache_behavior_layout->addWidget(new QLabel(tr("Cache Ahead:")), row, 0);
 
   cache_ahead_slider_ = new FloatSlider();
-  cache_ahead_slider_->SetFormat(tr("%1 seconds"));
+  cache_ahead_slider_->SetFormat(tr("%1 second(s)"));
   cache_ahead_slider_->SetMinimum(0);
   cache_ahead_slider_->SetValue(Config::Current()["DiskCacheAhead"].value<rational>().toDouble());
   cache_behavior_layout->addWidget(cache_ahead_slider_, row, 1);
@@ -78,7 +78,7 @@ PreferencesDiskTab::PreferencesDiskTab()
 
   cache_behind_slider_ = new FloatSlider();
   cache_behind_slider_->SetMinimum(0);
-  cache_behind_slider_->SetFormat(tr("%1 seconds"));
+  cache_behind_slider_->SetFormat(tr("%1 second(s)"));
   cache_behind_slider_->SetValue(Config::Current()["DiskCacheBehind"].value<rational>().toDouble());
   cache_behavior_layout->addWidget(cache_behind_slider_, row, 3);
 
diff --git a/app/dialog/preferences/tabs/preferencesgeneraltab.cpp b/app/dialog/preferences/tabs/preferencesgeneraltab.cpp
index e4ac956ab..aafe93d70 100644
--- a/app/dialog/preferences/tabs/preferencesgeneraltab.cpp
+++ b/app/dialog/preferences/tabs/preferencesgeneraltab.cpp
@@ -93,7 +93,7 @@ PreferencesGeneralTab::PreferencesGeneralTab()
 
   default_still_length_ = new FloatSlider();
   default_still_length_->SetMinimum(0.1);
-  default_still_length_->SetFormat(tr("%1 seconds"));
+  default_still_length_->SetFormat(tr("%1 second(s)"));
   default_still_length_->SetValue(Config::Current()["DefaultStillLength"].value<rational>().toDouble());
   general_layout->addWidget(default_still_length_);
 
diff --git a/app/project/item/footage/audiostream.cpp b/app/project/item/footage/audiostream.cpp
index 70cbfbc06..7b1ff0d15 100644
--- a/app/project/item/footage/audiostream.cpp
+++ b/app/project/item/footage/audiostream.cpp
@@ -31,9 +31,10 @@ AudioStream::AudioStream()
 
 QString AudioStream::description() const
 {
-  return QCoreApplication::translate("Stream", "%1: Audio - %2 Channels, %3Hz").arg(QString::number(index()),
-                                                                                    QString::number(channels()),
-                                                                                    QString::number(sample_rate()));
+  return QCoreApplication::translate("Stream", "%1: Audio - %2 Channel(s), %3Hz")
+      .arg(QString::number(index()),
+           QString::number(channels()),
+           QString::number(sample_rate()));
 }
 
 const int &AudioStream::channels() const
diff --git a/app/render/colormanager.h b/app/render/colormanager.h
index 7c79a39c2..286aa69d2 100644
--- a/app/render/colormanager.h
+++ b/app/render/colormanager.h
@@ -22,6 +22,7 @@
 #define COLORSERVICE_H
 
 #include <memory>
+#include <QMutex>
 
 #include "codec/frame.h"
 #include "colorprocessor.h"
@@ -91,6 +92,11 @@ public:
 
   };
 
+  QMutex* mutex()
+  {
+    return &mutex_;
+  }
+
 signals:
   void ConfigChanged();
 
@@ -109,6 +115,8 @@ private:
 
   QString reference_space_;
 
+  QMutex mutex_;
+
   static OCIO::ConstConfigRcPtr default_config_;
 
 };
diff --git a/app/render/colorprocessor.cpp b/app/render/colorprocessor.cpp
index 99aff541c..90ce7c15f 100644
--- a/app/render/colorprocessor.cpp
+++ b/app/render/colorprocessor.cpp
@@ -28,6 +28,8 @@ namespace olive {
 
 ColorProcessor::ColorProcessor(ColorManager *config, const QString &input, const ColorTransform &transform)
 {
+  QMutexLocker locker(config->mutex());
+
   const QString& output = (transform.output().isEmpty()) ? config->GetDefaultDisplay() : transform.output();
 
   if (transform.is_display()) {
diff --git a/app/task/project/import/import.cpp b/app/task/project/import/import.cpp
index 66fa1de18..be423648f 100644
--- a/app/task/project/import/import.cpp
+++ b/app/task/project/import/import.cpp
@@ -40,7 +40,7 @@ ProjectImportTask::ProjectImportTask(ProjectViewModel *model, Folder *folder, co
 
   file_count_ = Core::CountFilesInFileList(filenames_);
 
-  SetTitle(tr("Importing %1 files").arg(file_count_));
+  SetTitle(tr("Importing %1 file(s)").arg(file_count_));
 }
 
 const int &ProjectImportTask::GetFileCount() const
diff --git a/app/widget/nodeparamview/nodeparamviewarraywidget.cpp b/app/widget/nodeparamview/nodeparamviewarraywidget.cpp
index 46b04caba..dcbcb8e18 100644
--- a/app/widget/nodeparamview/nodeparamviewarraywidget.cpp
+++ b/app/widget/nodeparamview/nodeparamviewarraywidget.cpp
@@ -47,7 +47,7 @@ NodeParamViewArrayWidget::NodeParamViewArrayWidget(NodeInputArray* array, QWidge
 
 void NodeParamViewArrayWidget::UpdateCounter()
 {
-  count_lbl_->setText(tr("%1 elements").arg(array_->GetSize()));
+  count_lbl_->setText(tr("%1 element(s)").arg(array_->GetSize()));
 }
 
 void NodeParamViewArrayWidget::AddElement()