diff --git a/components/codetools/ide/cody.lpk b/components/codetools/ide/cody.lpk
index cb3bea7e9d..47d4693c2e 100644
--- a/components/codetools/ide/cody.lpk
+++ b/components/codetools/ide/cody.lpk
@@ -9,6 +9,10 @@
         <UnitOutputDirectory Value="lib/$(TargetCPU)-$(TargetOS)"/>
       </SearchPaths>
       <Other>
+        <CompilerMessages>
+          <UseMsgFile Value="True"/>
+        </CompilerMessages>
+        <CustomOptions Value="$(IDEBuildOptions)"/>
         <CompilerPath Value="$(CompPath)"/>
       </Other>
     </CompilerOptions>
@@ -51,7 +55,7 @@
       </Item8>
       <Item9>
         <Filename Value="codynodeinfodlg.pas"/>
-        <UnitName Value="codynodeinfodlg"/>
+        <UnitName Value="CodyNodeInfoDlg"/>
       </Item9>
     </Files>
     <LazDoc Paths="doc"/>
diff --git a/components/codetools/ide/codyregistration.pas b/components/codetools/ide/codyregistration.pas
index 95d481abf3..0a9a2f9532 100644
--- a/components/codetools/ide/codyregistration.pas
+++ b/components/codetools/ide/codyregistration.pas
@@ -97,7 +97,10 @@ begin
     crsDeclareVariable,
     CleanIDEShortCut,CleanIDEShortCut,nil,@ShowDeclareVariableDialog);
   RegisterIDEMenuCommand(SrcEditSubMenuRefactor, 'DeclareVariable',
-    crsDeclareVariable2, nil, nil, DeclareVariableCommand);
+    crsDeclareVariable2, nil, nil, DeclareVariableCommand)
+    {$IFNDEF EnableCodyDeclareVar}
+     .Visible:=false
+    {$ENDIF};
 
 
   // Refactor menu - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -