diff --git a/client/src/main/java/ctbrec/ui/RecordingsTab.java b/client/src/main/java/ctbrec/ui/RecordingsTab.java
index 473c3fa5..98edb20a 100644
--- a/client/src/main/java/ctbrec/ui/RecordingsTab.java
+++ b/client/src/main/java/ctbrec/ui/RecordingsTab.java
@@ -415,7 +415,8 @@ public class RecordingsTab extends Tab implements TabSelectionListener {
 
         MenuItem rerunPostProcessing = new MenuItem("Rerun Post-Processing");
         rerunPostProcessing.setOnAction(e -> triggerPostProcessing(first));
-        if ((first.getStatus() == State.FINISHED || first.getStatus() == State.WAITING) && first.isSegmented()) {
+        if (((first.getStatus() == State.FINISHED || first.getStatus() == State.WAITING) && first.isSegmented())
+                || first.getStatus() == State.WAITING && first.isSegmented()) {
             contextMenu.getItems().add(rerunPostProcessing);
         }
 
diff --git a/common/src/main/java/ctbrec/recorder/download/dash/DashDownload.java b/common/src/main/java/ctbrec/recorder/download/dash/DashDownload.java
index 45c04d11..fc1530ee 100644
--- a/common/src/main/java/ctbrec/recorder/download/dash/DashDownload.java
+++ b/common/src/main/java/ctbrec/recorder/download/dash/DashDownload.java
@@ -334,9 +334,11 @@ public class DashDownload implements Download {
     @Override
     public void postprocess(Recording recording) {
         try {
-            new FfmpegMuxer(downloadDir.toFile(), finalFile);
-            targetFile = finalFile;
             String path = recording.getPath();
+            File dir = new File(Config.getInstance().getSettings().recordingsDir, path);
+            File file = new File(dir.getParentFile(), dir.getName().substring(0, dir.getName().length() - 5));
+            new FfmpegMuxer(dir, file);
+            targetFile = file;
             recording.setPath(path.substring(0, path.length() - 5));
         } catch (ProcessExitedUncleanException | IOException e) {
             LOG.error("Error while merging dash segments", e);
diff --git a/common/src/main/java/ctbrec/sites/mfc/MyFreeCamsModel.java b/common/src/main/java/ctbrec/sites/mfc/MyFreeCamsModel.java
index b7e56a4c..89ea206f 100644
--- a/common/src/main/java/ctbrec/sites/mfc/MyFreeCamsModel.java
+++ b/common/src/main/java/ctbrec/sites/mfc/MyFreeCamsModel.java
@@ -324,6 +324,9 @@ public class MyFreeCamsModel extends AbstractModel {
 
     @Override
     public Download createDownload() {
+        if(streamUrl == null) {
+            updateStreamUrl();
+        }
         if(streamUrl.endsWith("m3u8")) {
             return super.createDownload();
         } else {