3 files changed, 3 insertions, 21 deletions
diff --git a/desktop/win32/source/officeloader/makefile.mk b/desktop/win32/source/officeloader/makefile.mk
index 10758727b743..5609dea25085 100644
--- a/desktop/win32/source/officeloader/makefile.mk
+++ b/desktop/win32/source/officeloader/makefile.mk
@@ -30,7 +30,6 @@ PRJ=..$/..$/..
 PRJNAME=desktop
 TARGET=officeloader
 LIBTARGET=NO
-#TARGETTYPE=GUI
 
 # --- Settings -----------------------------------------------------
 
@@ -41,23 +40,6 @@ LIBTARGET=NO
 OBJFILES = \
         $(OBJ)$/officeloader.obj
 
-#APP1TARGET=so$/officeloader
-#APP1NOSAL=TRUE
-#APP1LINKRES=$(MISC)$/$(TARGET).res
-#APP1ICON=$(SOLARRESDIR)$/icons/001_star_main.ico
-#APP1OBJS = \
-#		$(OBJ)$/officeloader.obj
-
-#APP2TARGET=officeloader
-#APP2NOSAL=TRUE
-#APP2LINKRES=$(MISC)$/$(TARGET).res
-#APP2ICON=$(SOLARRESDIR)$/icons/ooo_gulls.ico
-#APP2OBJS = \
-#		$(OBJ)$/officeloader.obj
-
-
 # --- Targets ------------------------------------------------------
 
-
 .INCLUDE :  target.mk
-
diff --git a/desktop/win32/source/setup/makefile.mk b/desktop/win32/source/setup/makefile.mk
index 15b7b1937e78..f0c6e0e955fd 100644
--- a/desktop/win32/source/setup/makefile.mk
+++ b/desktop/win32/source/setup/makefile.mk
@@ -43,9 +43,9 @@ ENABLE_EXCEPTIONS	=	TRUE
 
 INCPRE+=$(MFC_INCLUDE)
 
-.IF "$(USE_STLP_DEBUG)"!=""
+.IF "$(USE_DEBUG_RUNTIME)"!=""
 CDEFS+=-D_DEBUG
-.ENDIF # "$(USE_STLP_DEBUG)"!=""
+.ENDIF # "$(USE_DEBUG_RUNTIME)"!=""
 
 RCFILES=	$(RES)$/$(TARGET).rc
 
diff --git a/desktop/win32/source/setup/setup_main.cxx b/desktop/win32/source/setup/setup_main.cxx
index 5bfc8b6d155b..d99b671ba04c 100644
--- a/desktop/win32/source/setup/setup_main.cxx
+++ b/desktop/win32/source/setup/setup_main.cxx
@@ -129,7 +129,7 @@ extern "C" int __stdcall WinMain( HINSTANCE hInst, HINSTANCE, LPSTR, int )
     {
         pSetup->DisplayError( ERROR_OUTOFMEMORY );
     }
-    catch ( UINT nErr )
+    catch ( UINT &nErr )
     {
         pSetup->DisplayError( nErr );
     }