diff --git a/lazproj/coedit.lpi b/lazproj/coedit.lpi
index bf118728..9b4ffd24 100644
--- a/lazproj/coedit.lpi
+++ b/lazproj/coedit.lpi
@@ -52,11 +52,6 @@
             <Debugging>
               <UseHeaptrc Value="True"/>
             </Debugging>
-            <Options>
-              <Win32>
-                <GraphicApplication Value="True"/>
-              </Win32>
-            </Options>
           </Linking>
           <Other>
             <CompilerMessages>
diff --git a/src/ce_dcd.pas b/src/ce_dcd.pas
index 5b6e1ae7..958f7445 100644
--- a/src/ce_dcd.pas
+++ b/src/ce_dcd.pas
@@ -68,7 +68,7 @@ begin
   if DCD_server <> nil then
     FreeAndNil(DCD_server);
   DCD_server := TProcess.Create(nil);
-  DCD_server.Executable := extractFilePath(application.ExeName) + directorySeparator + 'dcd-server' + exeExt;
+  DCD_server.Executable := 'dcd-server' + exeExt;
   DCD_server.Options := [poUsePipes{$IFDEF WINDOWS}, poNewConsole{$ENDIF}];
   DCD_server.ShowWindow := swoHIDE;
 end;
@@ -198,10 +198,10 @@ end;
 initialization
   createServer;
   DCD_client := TProcess.Create(nil);
-  DCD_client.Executable := extractFilePath(application.ExeName) + directorySeparator + 'dcd-client' + exeExt;
+  DCD_client.Executable := 'dcd-client' + exeExt;
   DCD_client.Options := [poUsePipes{$IFDEF WINDOWS}, poNewConsole{$ENDIF}];
   DCD_client.ShowWindow := swoHIDE;
-  dcdOn := fileExists(DCD_server.Executable) and fileExists(DCD_client.Executable);
+  dcdOn := exeInSysPath(DCD_server.Executable) and exeInSysPath(DCD_client.Executable);
   lines := TStringList.Create;
 finalization
   DCD_server.Active := false;
diff --git a/src/ce_synmemo.pas b/src/ce_synmemo.pas
index bbfab415..64c2fd73 100644
--- a/src/ce_synmemo.pas
+++ b/src/ce_synmemo.pas
@@ -7,7 +7,7 @@ interface
 uses
   Classes, SysUtils, SynEdit, SynMemo, ce_d2syn, SynEditHighlighter, controls,
   lcltype, LazSynEditText, SynPluginSyncroEdit, SynEditKeyCmds, ce_project,
-  SynHighlighterLFM, SynEditMouseCmds, ce_common, ce_observer, menus;
+  SynHighlighterLFM, SynEditMouseCmds, ce_common, ce_observer;
 
 type
   TCESynMemo = class(TSynMemo)