diff --git a/components/chmhelp/lhelp/lhelp.res b/components/chmhelp/lhelp/lhelp.res
index cdc706e86b..0ad004b9d9 100644
Binary files a/components/chmhelp/lhelp/lhelp.res and b/components/chmhelp/lhelp/lhelp.res differ
diff --git a/components/chmhelp/packages/idehelp/lazchmhelp.pas b/components/chmhelp/packages/idehelp/lazchmhelp.pas
index b67cae4106..ae061ba7f9 100644
--- a/components/chmhelp/packages/idehelp/lazchmhelp.pas
+++ b/components/chmhelp/packages/idehelp/lazchmhelp.pas
@@ -239,7 +239,10 @@ begin
     end;
     {$IFDEF CHMLOADTIMES}
     DebugLn(['CHMLOADTIMES: ',Format('Loading chm files took %d ms',[DateTimeToTimeStamp(Now-StartTime).Time])]);
+
     {$ENDIF}
+
+
   finally
     fHelpConnection.EndUpdate;
     CHMFiles.Free;
@@ -448,7 +451,6 @@ var
   i: Integer;
   DB: TFPDocHTMLHelpDatabase;
   BaseURL: THelpBaseURLObject;
-  HelpDB: THelpDatabase;
 begin
   inherited Create(TheOwner);
   fHelpConnection := TLHelpConnection.Create;
@@ -456,9 +458,7 @@ begin
   AddSupportedMimeType('application/x-chm');
   for i := 0 to HelpDatabases.Count-1 do
   begin
-    HelpDB := HelpDatabases.Items[i];
-    if not (HelpDB is TFPDocHTMLHelpDatabase) then continue;
-    DB := TFPDocHTMLHelpDatabase(HelpDB);
+    DB := TFPDocHTMLHelpDatabase(HelpDatabases.Items[i]);
     BaseURL := THelpBaseURLObject(DB.BasePathObject);
     if (DB.ID = 'RTLUnits') and (BaseURL.BaseURL = '') then
     begin
@@ -537,7 +537,7 @@ begin
 
   SearchPath := GetHelpFilesPath;
   // Start up help viewer if needed - and tell it to hide
-  if not (fHelpConnection.ServerRunning) then
+  if not(fHelpConnection.ServerRunning) then
   begin
     fHelpConnection.StartHelpServer(HelpLabel, HelpExeFileName, true);
     Response := fHelpConnection.RunMiscCommand(mrVersion);
diff --git a/docs/html/build_lcl_docs.lpi b/docs/html/build_lcl_docs.lpi
index 46c365a3dc..4673eb69b4 100644
--- a/docs/html/build_lcl_docs.lpi
+++ b/docs/html/build_lcl_docs.lpi
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <CONFIG>
   <ProjectOptions>
-    <Version Value="12"/>
+    <Version Value="11"/>
     <PathDelim Value="\"/>
     <General>
       <Flags>
         <LRSInOutputDirectory Value="False"/>
-        <CompatibilityMode Value="True"/>
       </Flags>
       <SessionStorage Value="InIDEConfig"/>
+      <MainUnit Value="0"/>
       <Title Value="build_lcl_docs"/>
     </General>
     <BuildModes Count="1">
@@ -19,13 +19,13 @@
     </PublishOptions>
     <RunParams>
       <local>
-        <LaunchingApplication PathPlusParams="\usr\X11R6\bin\xterm -T &apos;Lazarus Run Output&apos; -e $(LazarusDir)\tools\runwait.sh $(TargetCmdLine)"/>
+        <LaunchingApplication PathPlusParams="\usr\X11R6\bin\xterm -T 'Lazarus Run Output' -e $(LazarusDir)\tools\runwait.sh $(TargetCmdLine)"/>
       </local>
       <FormatVersion Value="2"/>
       <Modes Count="1">
         <Mode0 Name="default">
           <local>
-            <LaunchingApplication PathPlusParams="\usr\X11R6\bin\xterm -T &apos;Lazarus Run Output&apos; -e $(LazarusDir)\tools\runwait.sh $(TargetCmdLine)"/>
+            <LaunchingApplication PathPlusParams="\usr\X11R6\bin\xterm -T 'Lazarus Run Output' -e $(LazarusDir)\tools\runwait.sh $(TargetCmdLine)"/>
           </local>
         </Mode0>
       </Modes>
diff --git a/examples/database/dblookup/project1.res b/examples/database/dblookup/project1.res
index cdc706e86b..bc23f8c77e 100644
Binary files a/examples/database/dblookup/project1.res and b/examples/database/dblookup/project1.res differ
diff --git a/ide/lazarus.res b/ide/lazarus.res
index a3ca42aa0e..daf660f5e4 100644
Binary files a/ide/lazarus.res and b/ide/lazarus.res differ
diff --git a/ide/project.pp b/ide/project.pp
index 78d2975dbb..6e4b688394 100644
--- a/ide/project.pp
+++ b/ide/project.pp
@@ -4678,9 +4678,8 @@ var
   PkgDependency: TPkgDependency;
 begin
   PkgDependency:=FindDependencyByNameInList(FirstRequiredDependency,pdlRequires,PackageName);
-  Result := Assigned(PkgDependency);
-  if Result then
-    RemoveRequiredDependency(PkgDependency);
+  if PkgDependency=nil then exit(false);
+  RemoveRequiredDependency(PkgDependency);
 end;
 
 procedure TProject.LockUnitComponentDependencies;