diff --git a/fcl/Makefile b/fcl/Makefile
index 5ed6e38fe0..e25a51ea8f 100644
--- a/fcl/Makefile
+++ b/fcl/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2006/10/13]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2006/08/20]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd x86_64-win64 arm-linux arm-palmos arm-wince arm-gba powerpc64-linux
@@ -2822,7 +2822,7 @@ ifeq ($(CPU_TARGET),powerpc)
 FPCCPUOPT:=-O1r
 endif
 else
-FPCCPUOPT:=-O2
+FPCCPUOPT:=-O1r
 endif
 override FPCOPT+=-Ur -Xs $(FPCCPUOPT) -n
 override FPCOPTDEF+=RELEASE
diff --git a/fcl/Makefile.fpc b/fcl/Makefile.fpc
index a920f9f3c7..2b9f3557f6 100644
--- a/fcl/Makefile.fpc
+++ b/fcl/Makefile.fpc
@@ -27,9 +27,9 @@ units=adler gzcrc gzio infblock infcodes inffast inftrees infutil minigzip paszl
 [target]
 dirs=xml image db shedit passrc net fpcunit web
 units=contnrs inifiles ezcgi pipes rtfpars idea base64 gettext \
-      iostream zstream cachecls avl_tree htmldefs xmlreg registry eventlog custapp \
-      cgiapp wformat whtml wtex rttiutils bufstream streamex blowfish zipper streamio \
-      inicol pooledmm
+      iostream zstream cachecls avl_tree htmldefs xmlreg registry \
+      eventlog custapp cgiapp wformat whtml wtex rttiutils bufstream \
+      streamex blowfish zipper streamio inicol pooledmm
 units_freebsd=process ssockets resolve fpasync syncobjs simpleipc dbugmsg dbugintf
 units_darwin=process ssockets resolve fpasync syncobjs simpleipc dbugmsg dbugintf
 units_solaris=process ssockets resolve fpasync syncobjs simpleipc dbugmsg dbugintf
diff --git a/fcl/xml/htmwrite.pp b/fcl/xml/htmwrite.pp
index fbce704506..a5c4a5ce59 100644
--- a/fcl/xml/htmwrite.pp
+++ b/fcl/xml/htmwrite.pp
@@ -178,8 +178,8 @@ end;
 
 procedure WriteElement(node: TDOMNode);
 var
-  h : THTMLElementTag;
   i: Integer;
+  J : THTMLElementTag;
   attr, child: TDOMNode;
   s: String;
   SavedInsideTextNode: Boolean;
@@ -187,10 +187,10 @@ var
 begin
   s := LowerCase(node.NodeName);
   ElFlags := [efSubelementContent, efPCDATAContent];    // default flags
-  for h := Low(HTMLElementProps) to High(HTMLElementProps) do
-    if HTMLElementProps[h].Name = s then
+  for j := Low(THTMLElementTag) to High(THTMLElementTag) do
+    if HTMLElementProps[J].Name = s then
     begin
-      ElFlags := HTMLElementProps[h].Flags;
+      ElFlags := HTMLElementProps[j].Flags;
       break;
     end;
 
diff --git a/fcl/xml/sax_html.pp b/fcl/xml/sax_html.pp
index ff55ea63da..f210be8b91 100644
--- a/fcl/xml/sax_html.pp
+++ b/fcl/xml/sax_html.pp
@@ -531,6 +531,7 @@ var
   i : Integer;
   j : THTMLElementTag;
   TagInfo: PHTMLElementProps;
+
 begin
   // WriteLn('End: ', LocalName, '. Node buffer: ', FNodeBuffer.Count, ' elements');
   // Find the matching start tag
@@ -544,7 +545,7 @@ begin
       // We found the matching start tag
 
       TagInfo := nil;
-      for j := Low(HTMLElementProps) to High(HTMLElementProps) do
+      for j := Low(THTMLElementTag) to High(THTMLElementTag) do
         if CompareText(HTMLElementProps[j].Name, LocalName) = 0 then
         begin
           TagInfo := @HTMLElementProps[j];