diff --git a/app/dialog/footageproperties/footageproperties.h b/app/dialog/footageproperties/footageproperties.h
index 7fd58a14e..aa71fa01e 100644
--- a/app/dialog/footageproperties/footageproperties.h
+++ b/app/dialog/footageproperties/footageproperties.h
@@ -65,6 +65,7 @@ private:
 
     virtual Project* GetRelevantProject() const override;
 
+  protected:
     virtual void redo() override;
     virtual void undo() override;
 
diff --git a/app/dialog/footageproperties/streamproperties/videostreamproperties.h b/app/dialog/footageproperties/streamproperties/videostreamproperties.h
index 3d858b2c1..ea689e2f0 100644
--- a/app/dialog/footageproperties/streamproperties/videostreamproperties.h
+++ b/app/dialog/footageproperties/streamproperties/videostreamproperties.h
@@ -92,6 +92,7 @@ private:
 
     virtual Project* GetRelevantProject() const override;
 
+  protected:
     virtual void redo() override;
     virtual void undo() override;
 
@@ -121,6 +122,7 @@ private:
 
     virtual Project* GetRelevantProject() const override;
 
+  protected:
     virtual void redo() override;
     virtual void undo() override;
 
diff --git a/app/widget/timelinewidget/undo/timelineundogeneral.cpp b/app/widget/timelinewidget/undo/timelineundogeneral.cpp
index a64d1e342..9d607d96f 100644
--- a/app/widget/timelinewidget/undo/timelineundogeneral.cpp
+++ b/app/widget/timelinewidget/undo/timelineundogeneral.cpp
@@ -364,7 +364,7 @@ void TrackListInsertGaps::redo()
   }
 
   if (split_command_) {
-    split_command_->redo();
+    split_command_->redo_now();
   }
 
   foreach (auto add_gap, gaps_added_) {
@@ -406,7 +406,7 @@ void TrackListInsertGaps::undo()
 
   // Un-split blocks
   if (split_command_) {
-    split_command_->undo();
+    split_command_->undo_now();
   }
 
   // Restore original length of gaps
diff --git a/app/widget/timelinewidget/undo/timelineundoripple.cpp b/app/widget/timelinewidget/undo/timelineundoripple.cpp
index 4d8ff9fb3..391feeede 100644
--- a/app/widget/timelinewidget/undo/timelineundoripple.cpp
+++ b/app/widget/timelinewidget/undo/timelineundoripple.cpp
@@ -110,7 +110,7 @@ void TrackRippleRemoveAreaCommand::redo()
 
   if (splice_split_command_) {
     // We're just splicing
-    splice_split_command_->redo();
+    splice_split_command_->redo_now();
 
     // Trim the in of the split
     Block* split = splice_split_command_->new_block();
@@ -157,7 +157,7 @@ void TrackRippleRemoveAreaCommand::undo()
   track_->BeginOperation();
 
   if (splice_split_command_) {
-    splice_split_command_->undo();
+    splice_split_command_->undo_now();
   } else {
     if (trim_out_.block) {
       trim_out_.block->set_length_and_media_out(trim_out_.old_length);
diff --git a/app/widget/timelinewidget/undo/timelineundosplit.cpp b/app/widget/timelinewidget/undo/timelineundosplit.cpp
index 06cdd1006..0d9c4e0c9 100644
--- a/app/widget/timelinewidget/undo/timelineundosplit.cpp
+++ b/app/widget/timelinewidget/undo/timelineundosplit.cpp
@@ -122,7 +122,7 @@ void BlockSplitPreservingLinksCommand::redo()
 
         if (b->in() < time && b->out() > time) {
           BlockSplitCommand* split_command = new BlockSplitCommand(b, time);
-          split_command->redo();
+          split_command->redo_now();
           splits.replace(j, split_command->new_block());
           commands_.append(split_command);
         } else {
diff --git a/app/widget/timelinewidget/undo/timelineundosplit.h b/app/widget/timelinewidget/undo/timelineundosplit.h
index 6984377f8..9705147b9 100644
--- a/app/widget/timelinewidget/undo/timelineundosplit.h
+++ b/app/widget/timelinewidget/undo/timelineundosplit.h
@@ -53,6 +53,7 @@ public:
     return new_block_;
   }
 
+protected:
   virtual void redo() override;
 
   virtual void undo() override;
@@ -88,6 +89,7 @@ public:
     return blocks_.first()->project();
   }
 
+protected:
   virtual void redo() override;
 
   virtual void undo() override
@@ -125,6 +127,7 @@ public:
     return track_->project();
   }
 
+protected:
   virtual void prepare() override;
 
   virtual void redo() override