diff --git a/src/WINNT/afsadmsvr/NTMakefile b/src/WINNT/afsadmsvr/NTMakefile
index 1bfc85949c..c2b7c1a338 100644
--- a/src/WINNT/afsadmsvr/NTMakefile
+++ b/src/WINNT/afsadmsvr/NTMakefile
@@ -74,7 +74,7 @@ EXEOBJS = \
 	$(OJT)\iTaAfsAdmSvr_s.obj
 
 VCLIBS =\
- 	gdi32.lib \
+	gdi32.lib \
 	user32.lib \
 	rpcns4.lib \
 	rpcrt4.lib \
@@ -106,6 +106,7 @@ MIDL_FLAGS=/ms_ext \
            /pack 8 \
            /W3 \
            /WX \
+	   /no_robust \
            /nologo
 
 .SUFFIXES: .h .idl
diff --git a/src/WINNT/afsd/NTMakefile b/src/WINNT/afsd/NTMakefile
index dd71d18baa..beae71dce1 100644
--- a/src/WINNT/afsd/NTMakefile
+++ b/src/WINNT/afsd/NTMakefile
@@ -118,6 +118,7 @@ MIDL_FLAGS=/app_config \
 	   /Zp4 \
 	   /cpp_cmd $(cc) \
 	   /cpp_opt "-E" \
+	   /no_robust \
            /nologo
 
 .SUFFIXES: .h .idl
@@ -360,4 +361,3 @@ clean::
 	$(DEL) $(LOG95_DLLFILE)
 
 mkdir:
-	
diff --git a/src/WINNT/afsd/cm_conn.c b/src/WINNT/afsd/cm_conn.c
index 6ebdf65221..c597c79d2e 100644
--- a/src/WINNT/afsd/cm_conn.c
+++ b/src/WINNT/afsd/cm_conn.c
@@ -174,8 +174,7 @@ cm_Analyze(cm_conn_t *connp, cm_user_t *userp, cm_req_t *reqp,
 		int same;
 
 		/* Log server being offline for this volume */
-		osi_Log4(afsd_logp, "cm_Analyze found server %d.%d.%d.%d
-marked offline for a volume",
+		osi_Log4(afsd_logp, "cm_Analyze found server %d.%d.%d.%d marked offline for a volume",
 			 ((serverp->addr.sin_addr.s_addr & 0xff)),
 			 ((serverp->addr.sin_addr.s_addr & 0xff00)>> 8),
 			 ((serverp->addr.sin_addr.s_addr & 0xff0000)>> 16),
diff --git a/src/WINNT/client_osi/NTMakefile b/src/WINNT/client_osi/NTMakefile
index b31b5cb1a7..abf58f67b8 100644
--- a/src/WINNT/client_osi/NTMakefile
+++ b/src/WINNT/client_osi/NTMakefile
@@ -111,7 +111,7 @@ $(EXEFILE) : $(EXEOBJS)
 # midl on dbrpc.idl
 
 dbrpc.h dbrpc_c.c dbrpc_s.c: dbrpc.idl
-	$(MIDL) $(AFSDEV_AUXMIDLFLAGS) -Zp4 -cpp_cmd $(cc) -cpp_opt "-E" $**
+	$(MIDL) $(AFSDEV_AUXMIDLFLAGS) -Zp4 -cpp_cmd $(cc) -cpp_opt "-E" /no_robust $**
 ############################################################################
 # generate versioninfo resources
 
@@ -141,4 +141,3 @@ clean::
 
 
 mkdir:
-