diff --git a/contrib/src/xrc/makefile.b32 b/contrib/src/xrc/makefile.b32
index af44b29d59..ea4476f53f 100644
--- a/contrib/src/xrc/makefile.b32
+++ b/contrib/src/xrc/makefile.b32
@@ -13,7 +13,7 @@ expat_dir = $(WXDIR)\contrib\src\xrc\expat
 XMLPARSEDIR = $(expat_dir)\xmlparse 
 XMLTOKDIR = $(expat_dir)\xmltok
 
-EXPAT_DEFS=-I$(expat_dir)\xmlparse -I$(expat_dir)\xmltok
+EXPAT_DEFS=-I$(expat_dir)\xmlparse -I$(expat_dir)\xmltok -I$(BCCDIR)\include 
 EXPAT_OBJECTS=xmltok.obj xmlrole.obj xmlparse.obj
 
 EXTRACPPFLAGS=$(wxLIBXMLDIR) $(EXPAT_DEFS)
diff --git a/distrib/msw/makeinno.bat b/distrib/msw/makeinno.bat
index 59f04ddee2..552b8589cf 100755
--- a/distrib/msw/makeinno.bat
+++ b/distrib/msw/makeinno.bat
@@ -30,11 +30,15 @@ echo [Dirs] >> %temp\files2.tmp
 
 do i = 0 to %len by 1
     set line=%@LINE[%TEMP\files1.tmp,%i]
+Rem    echo line is %line
     Rem Skip files.
     if not isdir %line enddo
     set sz2=%@LEN[%line]
+Rem    echo size is %sz2
     set n=%@EVAL[%sz2-%sz]
+Rem    echo n is %sz2
     set line2=%@SUBSTR[%line,%sz,%n]
+Rem    echo line2 is %line2
     if "%line2%" == "" enddo
 
     echo   Name: {app}\%line2 >> %TEMP\files2.tmp
@@ -63,7 +67,7 @@ enddo
 Rem Concatenate the 3 sections
 cat %wxwindir\distrib\msw\innotop.txt %TEMP\files2.tmp %wxwindir\distrib\msw\innobott.txt > %wxwindir\distrib\msw\wxwin2.iss
 
-erase /Y %TEMP\files1.tmp
+rem erase /Y %TEMP\files1.tmp
 rem erase /Y %TEMP\files2.tmp
 
 goto end
diff --git a/docs/latex/wx/app.tex b/docs/latex/wx/app.tex
index 080164f33c..1e776e2f8a 100644
--- a/docs/latex/wx/app.tex
+++ b/docs/latex/wx/app.tex
@@ -130,7 +130,7 @@ manner to refer to the application.
 
 \membersection{wxApp::GetExitOnFrameDelete}\label{wxappgetexitonframedelete}
 
-\constfunc{bool}{GetExitFrameOnDelete}{\void}
+\constfunc{bool}{GetExitOnFrameDelete}{\void}
 
 Returns TRUE if the application will exit when the top-level window is deleted, FALSE
 otherwise.
diff --git a/docs/latex/wx/wx.hpj b/docs/latex/wx/wx.hpj
index 037b040bba..f492243efc 100644
--- a/docs/latex/wx/wx.hpj
+++ b/docs/latex/wx/wx.hpj
@@ -1,5 +1,5 @@
 [OPTIONS]
-BMROOT=c:\wx24\wxwind~1\docs/latex/wx ; Assume that bitmaps are where the source is
+BMROOT=c:\wx24\wxWind~1\docs\latex\wx
 TITLE=wxWindows Manual
 CONTENTS=Contents
 COMPRESS=HIGH
diff --git a/include/wx/msw/setup0.h b/include/wx/msw/setup0.h
index 3b582570a9..ed35983660 100644
--- a/include/wx/msw/setup0.h
+++ b/include/wx/msw/setup0.h
@@ -885,7 +885,7 @@
 // ----------------------------------------------------------------------------
 
 // Define 1 to use ODBC classes
-#define wxUSE_ODBC          0
+#define wxUSE_ODBC          1
 
 // For backward compatibility reasons, this parameter now only controls the
 // default scrolling method used by cursors.  This default behavior can be
@@ -921,7 +921,7 @@
 // Default is 1.
 //
 // Recommended setting: whatever your compiler likes more
-#define wxUSE_IOSTREAMH     1
+#define wxUSE_IOSTREAMH     0
 
 // ----------------------------------------------------------------------------
 // image format support
diff --git a/samples/makefile.vc b/samples/makefile.vc
index 78d17950dc..6595c0dc83 100644
--- a/samples/makefile.vc
+++ b/samples/makefile.vc
@@ -92,10 +92,10 @@ all:
         nmake -f makefile.vc $(MAKEFLAGS)
         cd $(WXDIR)\samples\menu
         nmake -f makefile.vc $(MAKEFLAGS)
-!if "$(FINAL)" == "0"
-        cd $(WXDIR)\samples\memcheck
-        nmake -f makefile.vc $(MAKEFLAGS)
-!endif
+#!if "$(FINAL)" == "0"
+#        cd $(WXDIR)\samples\memcheck
+#        nmake -f makefile.vc $(MAKEFLAGS)
+#!endif
 !if "$(COMPIL)"==""
         cd $(WXDIR)\samples\mfc
         nmake -f makefile.vc $(MAKEFLAGS)
diff --git a/src/xrc/makefile.b32 b/src/xrc/makefile.b32
index af44b29d59..ea4476f53f 100644
--- a/src/xrc/makefile.b32
+++ b/src/xrc/makefile.b32
@@ -13,7 +13,7 @@ expat_dir = $(WXDIR)\contrib\src\xrc\expat
 XMLPARSEDIR = $(expat_dir)\xmlparse 
 XMLTOKDIR = $(expat_dir)\xmltok
 
-EXPAT_DEFS=-I$(expat_dir)\xmlparse -I$(expat_dir)\xmltok
+EXPAT_DEFS=-I$(expat_dir)\xmlparse -I$(expat_dir)\xmltok -I$(BCCDIR)\include 
 EXPAT_OBJECTS=xmltok.obj xmlrole.obj xmlparse.obj
 
 EXTRACPPFLAGS=$(wxLIBXMLDIR) $(EXPAT_DEFS)