diff --git a/src/gnuwin32/Makefile b/src/gnuwin32/Makefile
index 7d5bfad3134..3d23b55c050 100644
--- a/src/gnuwin32/Makefile
+++ b/src/gnuwin32/Makefile
@@ -1,7 +1,7 @@
 include MkRules
 
 HELP = YES
-WINHELP = BOTH # NO, CHM, BOTH
+WINHELP = NO # BOTH # NO, CHM, BOTH
 
 PACKAGES = base ctest eda lqs modreg mva nls splines stepfun ts
 ALLPACKAGES = $(PACKAGES) tcltk
diff --git a/src/gnuwin32/front-ends/rproxy_impl.c b/src/gnuwin32/front-ends/rproxy_impl.c
index 164c0e1a5d7..44e510af0f9 100644
--- a/src/gnuwin32/front-ends/rproxy_impl.c
+++ b/src/gnuwin32/front-ends/rproxy_impl.c
@@ -21,7 +21,7 @@
  *  Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
  *  MA 02111-1307, USA
  *
- *  $Id: rproxy_impl.c,v 1.8 2000/04/24 08:48:48 ripley Exp $
+ *  $Id: rproxy_impl.c,v 1.8.6.1 2000/06/28 09:52:29 luke Exp $
  */
 
 #define NONAMELESSUNION
@@ -202,8 +202,8 @@ int SEXP2BDX_Data (SEXP pExpression,BDX_Data** pData)
 	  lData->raw_data[0].double_value = REAL (pExpression)[0];
 	  break;
 	case BDX_STRING:
-	  lData->raw_data[0].string_value = strdup (CHAR (STRING (pExpression)[0]));
-	  // lData->raw_data[0].string_value = strdup (STRING (pExpression)[0]);
+	  lData->raw_data[0].string_value = strdup (CHAR (STRING_ELT(pExpression, 0)));
+	  // lData->raw_data[0].string_value = strdup (STRING_ELT(pExpression, 0));
 	  break;
 	}
       //      UNPROTECT (1);
@@ -251,8 +251,8 @@ int SEXP2BDX_Data (SEXP pExpression,BDX_Data** pData)
 		  lData->raw_data[i].double_value = REAL (pExpression)[i];
 		  break;
 		case BDX_STRING:
-		  lData->raw_data[i].string_value = strdup (CHAR (STRING (pExpression)[i]));
-		  // lData->raw_data[0].string_value = strdup (STRING (pExpression)[0]);
+		  lData->raw_data[i].string_value = strdup (CHAR (STRING_ELT(pExpression, i)));
+		  // lData->raw_data[0].string_value = strdup (STRING_ELT(pExpression, 0));
 		  break;
 		}
 	    }
@@ -304,7 +304,7 @@ int SEXP2BDX_Data (SEXP pExpression,BDX_Data** pData)
 		      break;
 		    case BDX_STRING:
 		      //lData->raw_data[i].string_value = strdup ("test");
-		      lData->raw_data[i].string_value = strdup (CHAR (STRING (pExpression)[i]));
+		      lData->raw_data[i].string_value = strdup (CHAR (STRING_ELT(pExpression, i)));
 		      break;
 		    }
 		}
@@ -611,7 +611,7 @@ int R_Proxy_set_symbol (char const* pSymbol,BDX_Data const* pData)
 	      PROTECT (lStringSExp); lProtectCount++;
 	      strcpy (CHAR(lStringSExp),pData->raw_data[0].string_value);
 	      lData = PROTECT (allocVector (STRSXP,1));
-	      STRING(lData)[0] = lStringSExp;
+	      SET_STRING_ELT(lData, 0, lStringSExp);
 	    }
 	    break;
 	  default:
@@ -679,7 +679,7 @@ int R_Proxy_set_symbol (char const* pSymbol,BDX_Data const* pData)
 		    allocString (strlen (pData->raw_data[i].string_value));
 		  PROTECT (lStringSExp); lProtectCount++;
 		  strcpy (CHAR(lStringSExp),pData->raw_data[i].string_value);
-		  STRING(lData)[i] = lStringSExp;
+		  SET_STRING_ELT(lData, i, lStringSExp);
 		}
 	    }
 	    break;