diff --git a/src/html/htmlwin.cpp b/src/html/htmlwin.cpp
index 962fa16d1e..f58a25578d 100644
--- a/src/html/htmlwin.cpp
+++ b/src/html/htmlwin.cpp
@@ -361,9 +361,9 @@ bool wxHtmlWindow::HistoryBack()
     if (a == wxEmptyString) LoadPage(l);
     else LoadPage(l + "#" + a);
     m_HistoryOn = TRUE;
-    Scroll(0, m_History[m_HistoryPos].GetPos());
-//    wxYield();
+    wxYield();
     m_tmpCanDrawLocks--;
+    Scroll(0, m_History[m_HistoryPos].GetPos());
     Refresh();
     return TRUE;
 }
@@ -387,9 +387,9 @@ bool wxHtmlWindow::HistoryForward()
     if (a == wxEmptyString) LoadPage(l);
     else LoadPage(l + "#" + a);
     m_HistoryOn = TRUE;
-    Scroll(0, m_History[m_HistoryPos].GetPos());
-//    wxYield();
+    wxYield();
     m_tmpCanDrawLocks--;
+    Scroll(0, m_History[m_HistoryPos].GetPos());
     Refresh();
     return TRUE;
 }
@@ -586,14 +586,15 @@ IMPLEMENT_DYNAMIC_CLASS(wxHtmlWinModule, wxModule)
 
 ///// default mod handlers are forced there:
 
-FORCE_LINK(mod_layout)
-FORCE_LINK(mod_fonts)
-FORCE_LINK(mod_image)
-FORCE_LINK(mod_list)
-FORCE_LINK(mod_pre)
-FORCE_LINK(mod_hline)
-FORCE_LINK(mod_links)
-FORCE_LINK(mod_tables)
+FORCE_LINK(m_layout)
+FORCE_LINK(m_fonts)
+FORCE_LINK(m_image)
+FORCE_LINK(m_list)
+FORCE_LINK(m_dflist)
+FORCE_LINK(m_pre)
+FORCE_LINK(m_hline)
+FORCE_LINK(m_links)
+FORCE_LINK(m_tables)
 
 
 #endif
diff --git a/src/html/m_hline.cpp b/src/html/m_hline.cpp
index 1f09c5d378..fdb5a1fa48 100644
--- a/src/html/m_hline.cpp
+++ b/src/html/m_hline.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        mod_hline.cpp
+// Name:        m_hline.cpp
 // Purpose:     wxHtml module for horizontal line (HR tag)
 // Author:      Vaclav Slavik
 // RCS-ID:      $Id$
@@ -31,7 +31,7 @@
 
 #include "wx/html/htmlcell.h"
 
-FORCE_LINK_ME(mod_hline)
+FORCE_LINK_ME(m_hline)
 
 
 //-----------------------------------------------------------------------------
diff --git a/src/html/m_image.cpp b/src/html/m_image.cpp
index c8b27e55ae..96e6b112dd 100644
--- a/src/html/m_image.cpp
+++ b/src/html/m_image.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        mod_image.cpp
+// Name:        m_image.cpp
 // Purpose:     wxHtml module for displaying images
 // Author:      Vaclav Slavik
 // RCS-ID:      $Id$
@@ -34,7 +34,7 @@
 #include <math.h>
 #include <float.h>
 
-FORCE_LINK_ME(mod_image)
+FORCE_LINK_ME(m_image)
 
 
 
diff --git a/src/html/m_layout.cpp b/src/html/m_layout.cpp
index ccd8b2f8ac..df2615cf1d 100644
--- a/src/html/m_layout.cpp
+++ b/src/html/m_layout.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        mod_layout.cpp
+// Name:        m_layout.cpp
 // Purpose:     wxHtml module for basic paragraphs/layout handling
 // Author:      Vaclav Slavik
 // RCS-ID:      $Id$
@@ -29,7 +29,7 @@
 
 #include "wx/html/htmlwin.h"
 
-FORCE_LINK_ME(mod_layout)
+FORCE_LINK_ME(m_layout)
 
 
 TAG_HANDLER_BEGIN(P, "P")
diff --git a/src/html/m_links.cpp b/src/html/m_links.cpp
index 462cd36acf..c3220d063b 100644
--- a/src/html/m_links.cpp
+++ b/src/html/m_links.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        mod_links.cpp
+// Name:        m_links.cpp
 // Purpose:     wxHtml module for links & anchors
 // Author:      Vaclav Slavik
 // RCS-ID:      $Id$
@@ -29,7 +29,7 @@
 #include "wx/html/m_templ.h"
 
 
-FORCE_LINK_ME(mod_links)
+FORCE_LINK_ME(m_links)
 
 
 class wxHtmlAnchorCell : public wxHtmlCell
diff --git a/src/html/m_list.cpp b/src/html/m_list.cpp
index 9640d52685..4a374ced8c 100644
--- a/src/html/m_list.cpp
+++ b/src/html/m_list.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        mod_list.cpp
+// Name:        m_list.cpp
 // Purpose:     wxHtml module for lists
 // Author:      Vaclav Slavik
 // RCS-ID:      $Id$
@@ -30,7 +30,7 @@
 
 #include "wx/html/htmlcell.h"
 
-FORCE_LINK_ME(mod_list)
+FORCE_LINK_ME(m_list)
 
 
 //-----------------------------------------------------------------------------
diff --git a/src/html/m_pre.cpp b/src/html/m_pre.cpp
index e073b69a35..78e1397558 100644
--- a/src/html/m_pre.cpp
+++ b/src/html/m_pre.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        mod_pre.cpp
+// Name:        m_pre.cpp
 // Purpose:     wxHtml module for <PRE> ... </PRE> tag (code citation)
 // Author:      Vaclav Slavik
 // RCS-ID:      $Id$
@@ -30,7 +30,7 @@
 #include "wx/html/htmlcell.h"
 #include "wx/tokenzr.h"
 
-FORCE_LINK_ME(mod_pre)
+FORCE_LINK_ME(m_pre)
 
 
 //-----------------------------------------------------------------------------
diff --git a/src/html/m_tables.cpp b/src/html/m_tables.cpp
index 6f631bb527..334c242cf8 100644
--- a/src/html/m_tables.cpp
+++ b/src/html/m_tables.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        mod_tables.cpp
+// Name:        m_tables.cpp
 // Purpose:     wxHtml module for tables
 // Author:      Vaclav Slavik
 // RCS-ID:      $Id$
@@ -26,7 +26,7 @@
 
 /*
 REMARKS:
-    1. This version of mod_tables doesn't support auto-layout algorithm.
+    1. This version of m_tables doesn't support auto-layout algorithm.
        This means that all columns are of same width unless explicitly specified.
 */
 
@@ -36,7 +36,7 @@ REMARKS:
 
 #include "wx/html/htmlcell.h"
 
-FORCE_LINK_ME(mod_tables)
+FORCE_LINK_ME(m_tables)
 
 
 #define TABLE_BORDER_CLR_1  wxColour(0xC5, 0xC2, 0xC5)