diff --git a/Makefile.mingw b/Makefile.mingw
index 6906eddbc..a4e0e29be 100644
--- a/Makefile.mingw
+++ b/Makefile.mingw
@@ -199,7 +199,8 @@ src/output/libmtxoutput.a: $(libmtxoutput_OBJECTS)
 
 mkvmerge_SOURCES = src/mkvmerge.cpp \
 			src/cluster_helper.cpp \
-			src/pr_generic.cpp
+			src/pr_generic.cpp \
+			src/timecode_factory.cpp
 mkvmerge_OBJECTS := $(patsubst %.cpp,%.o,$(mkvmerge_SOURCES))
 mkvmerge_DEPENDENCIES += $(DEP_COMMON) \
 		$(DEP_COMP) $(DEP_INPUT) $(DEP_OUTPUT) $(DEP_AVI) $(DEP_RMFF)
diff --git a/src/mmg/mmg.cpp b/src/mmg/mmg.cpp
index e0ab9078b..647f35ef0 100644
--- a/src/mmg/mmg.cpp
+++ b/src/mmg/mmg.cpp
@@ -669,8 +669,10 @@ mmg_dialog::mmg_dialog():
                wxGROW, 5);
 
   tc_output = new wxTextCtrl(panel, ID_TC_OUTPUT, wxT(""));
-  sbs_low->Add(tc_output, 1, wxALIGN_CENTER_VERTICAL | wxLEFT | wxRIGHT |
-               wxGROW, 5);
+  sbs_low->Add(0, 5, 0, 0, 0);
+  sbs_low->Add(tc_output, 1, wxALIGN_CENTER_VERTICAL | wxTOP | wxBOTTOM |
+               wxGROW, 2);
+  sbs_low->Add(0, 5, 0, 0, 0);
 
   b_browse_output = new wxButton(panel, ID_B_BROWSEOUTPUT, wxT("Browse"));
   sbs_low->Add(b_browse_output, 0, wxALIGN_CENTER_VERTICAL | wxALL, 3);
@@ -710,8 +712,10 @@ mmg_dialog::mmg_dialog():
 
 #ifdef SYS_WINDOWS
   SetSizeHints(520, 740);
+  SetSize(520, 740);
 #else
   SetSizeHints(520, 718);
+  SetSize(520, 718);
 #endif
 
   last_open_dir = wxT("");
diff --git a/src/mmg/tab_global.cpp b/src/mmg/tab_global.cpp
index 26f70af9b..22bc94af5 100644
--- a/src/mmg/tab_global.cpp
+++ b/src/mmg/tab_global.cpp
@@ -279,8 +279,10 @@ tab_global::tab_global(wxWindow *parent):
                    0, wxALIGN_CENTER_VERTICAL | wxLEFT | wxRIGHT, 5);
 
   tc_global_tags = new wxTextCtrl(this, ID_TC_GLOBALTAGS, wxT(""));
+  siz_gl_tags->Add(0, 5, 0, 0, 0);
   siz_gl_tags->Add(tc_global_tags, 1, wxALIGN_CENTER_VERTICAL | wxGROW |
-                   wxLEFT | wxRIGHT, 5);
+                   wxTOP | wxBOTTOM, 2);
+  siz_gl_tags->Add(0, 5, 0, 0, 0);
   b_browse_global_tags = new wxButton(this, ID_B_BROWSEGLOBALTAGS,
                                       wxT("Browse"));
   b_browse_global_tags->SetToolTip(TIP("The difference between tags associated"