diff --git a/components/codetools/definetemplates.pas b/components/codetools/definetemplates.pas
index b318ffab67..128f74d25e 100644
--- a/components/codetools/definetemplates.pas
+++ b/components/codetools/definetemplates.pas
@@ -1944,7 +1944,7 @@ var
   begin
     FuncData.Param:=Params;
     FuncData.Result:='';
-    FMacroFunctions.DoDataFunction(@FuncName[1],length(FuncName),@FuncData);
+    FMacroFunctions.DoDataFunction(PChar(FuncName),length(FuncName),@FuncData);
     Result:=FuncData.Result;
   end;
   
@@ -1954,8 +1954,8 @@ var
   begin
     FuncData.Param:=MacroVariable;
     FuncData.Result:='';
-    Result:=FMacroFunctions.DoDataFunction(
-            PChar(MacroVariable),length(MacroVariable),@FuncData);
+    Result:=FMacroVariables.DoDataFunction(
+                          PChar(MacroVariable),length(MacroVariable),@FuncData);
     if Result then
       MacroVariable:=FuncData.Result;
   end;
diff --git a/ide/main.pp b/ide/main.pp
index 8e07a8c279..c2a15dd36b 100644
--- a/ide/main.pp
+++ b/ide/main.pp
@@ -9215,6 +9215,7 @@ begin
   Result:=false;
   if Project1<>nil then begin
     FuncData^.Result:=Project1.CompilerOptions.GetUnitPath(false);
+    //DebugLn('TMainIDE.OnMacroFuncProjectSrcPath "',FuncData^.Result,'"');
     Result:=true;
   end;
 end;
@@ -9239,6 +9240,7 @@ begin
   Result:=false;
   if Project1<>nil then begin
     FuncData^.Result:=Project1.CompilerOptions.GetSrcPath(false);
+    //DebugLn('TMainIDE.OnMacroFuncProjectSrcPath "',FuncData^.Result,'"');
     Result:=true;
   end;
 end;