diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/adv.WizardPageSimple.Chain.1.py b/docs/sphinx/rest_substitutions/snippets/python/converted/adv.WizardPageSimple.Chain.1.py
new file mode 100644
index 00000000..94dd2fd6
--- /dev/null
+++ b/docs/sphinx/rest_substitutions/snippets/python/converted/adv.WizardPageSimple.Chain.1.py
@@ -0,0 +1,5 @@
+    
+            page3 = wx.RadioboxPage(wizard)
+            page4 = wx.ValidationPage(wizard)
+    
+            wx.adv.WizardPageSimple.Chain(page3, page4)
diff --git a/etgtools/sphinx_generator.py b/etgtools/sphinx_generator.py
index 9711f911..eeff0337 100644
--- a/etgtools/sphinx_generator.py
+++ b/etgtools/sphinx_generator.py
@@ -1041,7 +1041,9 @@ class Section(Node):
             # Special treatment for the versionadded
             if len(text) > 6:
                 version, remainder = text[0:6], text[6:]
-                text = '%s\n%s%s'%(version, sub_spacer, remainder)
+                if '.' in version:
+                    text = '%s\n%s%s'%(version, sub_spacer, remainder)
+                    
 
         elif section_type == 'deprecated':
             # Special treatment for deprecated, wxWidgets devs do not put the version number
diff --git a/sphinxtools/postprocess.py b/sphinxtools/postprocess.py
index c4d442ea..4c460723 100644
--- a/sphinxtools/postprocess.py
+++ b/sphinxtools/postprocess.py
@@ -150,6 +150,10 @@ def BuildEnumsAndMethods(sphinxDir):
         text = text.replace('non-NULL', 'not ``None``')
         text = text.replace(',,', ',').replace(', ,', ',')
         text = text.replace('|wx', '|')
+        
+        # Replacements for ScrolledWindow and ScrolledCanvas...
+        text = text.replace('<wxWindow>', 'Window')
+        text = text.replace('<wxPanel>', 'Panel')
 
         if 'DocstringsGuidelines' not in input:
             # Leave the DocstringsGuidelines.txt file alone on these ones