diff --git a/Makefile b/Makefile
index 0727da912d..3d41441d68 100644
--- a/Makefile
+++ b/Makefile
@@ -156,7 +156,8 @@ override PACKAGE_VERSION=0.7a
 ifndef LCLPLATFORM
 ifeq ($(OS_TARGET), win32)
 LCLPLATFORM=win32
-export OPT+=-dSUPPORTS_RESOURCES
+override FPCOPT+=-dSUPPORTS_RESOURCES
+export FPCOPT
 else
 LCLPLATFORM=gtk
 endif
diff --git a/Makefile.fpc b/Makefile.fpc
index 8416dc45e3..cabb3fb756 100644
--- a/Makefile.fpc
+++ b/Makefile.fpc
@@ -37,7 +37,8 @@ destdir=$(BASEDIR)/dist
 ifndef LCLPLATFORM
 ifeq ($(OS_TARGET), win32)
 LCLPLATFORM=win32
-export OPT+=-dSUPPORTS_RESOURCES
+override FPCOPT+=-dSUPPORTS_RESOURCES
+export FPCOPT
 else
 LCLPLATFORM=gtk
 endif
diff --git a/lcl/interfaces/win32/win32object.inc b/lcl/interfaces/win32/win32object.inc
index 99b889f826..0b3ebb7d7f 100644
--- a/lcl/interfaces/win32/win32object.inc
+++ b/lcl/interfaces/win32/win32object.inc
@@ -110,8 +110,8 @@ Begin
     {csComboBox, }csEdit, csMemo:
     Begin
       CapLen := GetWindowTextLength((Sender As TWinControl).Handle);
-      GetWindowText((Sender As TWinControl).Handle, @Caption, CapLen + 1);
-      Data := StrPas(PChar(@Caption));
+      GetWindowText((Sender As TWinControl).Handle, Caption, CapLen + 1);
+      Data := StrPas(Caption);
     End;
     csPage:
     Begin 
@@ -2953,6 +2953,9 @@ End;
 
 {
   $Log$
+  Revision 1.10  2002/01/24 07:34:50  lazarus
+  Keith: Fixed some bugs
+
   Revision 1.9  2002/01/21 08:42:06  lazarus
   Keith: Fixed some run-time exceptions for FPC 1.1