diff --git a/app/decoder/decoder.cpp b/app/decoder/decoder.cpp
index 96ee1f257..b31e74da3 100644
--- a/app/decoder/decoder.cpp
+++ b/app/decoder/decoder.cpp
@@ -93,6 +93,8 @@ bool Decoder::ProbeMedia(Footage *f)
 
     if (decoder->Probe(f)) {
 
+
+
       // We found a Decoder, so we can set this media as valid
       f->set_status(Footage::kReady);
 
diff --git a/app/decoder/ffmpeg/ffmpegdecoder.cpp b/app/decoder/ffmpeg/ffmpegdecoder.cpp
index a9b300ec1..aa0650f17 100644
--- a/app/decoder/ffmpeg/ffmpegdecoder.cpp
+++ b/app/decoder/ffmpeg/ffmpegdecoder.cpp
@@ -390,10 +390,7 @@ bool FFmpegDecoder::Probe(Footage *f)
           break;
 
         // We should never realistically get here, but we make an "invalid" stream just in case
-        // We don't use a "default:" in case more AVMEDIA_TYPEs get introduced in later APIs that need handling
-        case AVMEDIA_TYPE_NB:
-        case AVMEDIA_TYPE_VIDEO:
-        case AVMEDIA_TYPE_AUDIO:
+        default:
           str->set_type(Stream::kUnknown);
           break;
         }
diff --git a/app/task/import/import.cpp b/app/task/import/import.cpp
index d742866bd..d308440f3 100644
--- a/app/task/import/import.cpp
+++ b/app/task/import/import.cpp
@@ -58,6 +58,7 @@ bool ImportTask::Action()
     return true;
   }
 
+  // FIXME: This should be run in the main thread somehow
   olive::undo_stack.push(command);
 
   return true;
diff --git a/app/task/task.cpp b/app/task/task.cpp
index 77b53e108..860997683 100644
--- a/app/task/task.cpp
+++ b/app/task/task.cpp
@@ -93,11 +93,6 @@ void Task::AddDependency(Task *dependency)
   dependencies_.append(dependency);
 }
 
-void Task::EmitRemovedSignal()
-{
-  emit Removed();
-}
-
 void Task::ResetState()
 {
   if (status_ == kWaiting) {
diff --git a/app/task/task.h b/app/task/task.h
index 1b5956065..856cc8305 100644
--- a/app/task/task.h
+++ b/app/task/task.h
@@ -140,11 +140,6 @@ public:
    */
   void AddDependency(Task* dependency);
 
-  /**
-   * @brief Emit the Removed() signal when this Task is about to get removed
-   */
-  void EmitRemovedSignal();
-
   /**
    * @brief Reset this Task back to the waiting state
    */
diff --git a/app/task/taskmanager.cpp b/app/task/taskmanager.cpp
index 04ece9eef..c27f7ded5 100644
--- a/app/task/taskmanager.cpp
+++ b/app/task/taskmanager.cpp
@@ -97,7 +97,7 @@ void TaskManager::DeleteTask(Task *t)
   // Remove instances of Task from queue
   for (int i=0;i<tasks_.size();i++) {
     if (tasks_.at(i).get() == t) {
-      t->EmitRemovedSignal();
+      emit t->Removed();
       tasks_.removeAt(i);
       break;
     }
diff --git a/app/window/mainwindow/mainwindow.cpp b/app/window/mainwindow/mainwindow.cpp
index 4e27d788c..edcd173b4 100644
--- a/app/window/mainwindow/mainwindow.cpp
+++ b/app/window/mainwindow/mainwindow.cpp
@@ -27,6 +27,7 @@
 #include "panel/node/node.h"
 #include "panel/param/param.h"
 #include "panel/project/project.h"
+#include "panel/taskmanager/taskmanager.h"
 #include "panel/timeline/timeline.h"
 #include "panel/tool/tool.h"
 #include "panel/viewer/viewer.h"