diff --git a/ide/buildlazdialog.pas b/ide/buildlazdialog.pas
index 005b23ef50..24524fa580 100644
--- a/ide/buildlazdialog.pas
+++ b/ide/buildlazdialog.pas
@@ -58,7 +58,7 @@ uses
   // IDE
   LazarusIDEStrConsts, TransferMacros, LazConf, IDEProcs, DialogProcs,
   MainBar, ExtToolEditDlg, EnvironmentOpts,
-  ApplicationBundle, CompilerOptions, BuildProfileManager,
+  ApplicationBundle, ModeMatrixOpts, CompilerOptions, BuildProfileManager,
   GenericListEditor, GenericCheckList, PackageSystem, PackageDefs;
 
 type
@@ -415,7 +415,6 @@ begin
   Result:=mrCancel;
   fProfile:=Profile;
   if CalcTargets(Flags)<>mrOk then exit;
-  debugln(['TLazarusBuilder.MakeLazarus AAA1 ',fExtraOptions]);
 
   if LazarusIDE<>nil then
     LazarusIDE.MainBarSubTitle:=Profile.Name;
@@ -590,6 +589,9 @@ begin
     {$ENDIF}
 
     AppendExtraOption(fProfile.ExtraOptions,false);
+
+    if OnAppendCustomOption<>nil then
+      OnAppendCustomOption(Self,fExtraOptions,[bmgtEnvironment]);
   end;
 
   // set target filename and target directory:
diff --git a/ide/buildmanager.pas b/ide/buildmanager.pas
index a32de7fc3b..657350e9f5 100644
--- a/ide/buildmanager.pas
+++ b/ide/buildmanager.pas
@@ -2576,7 +2576,8 @@ begin
     Result:=BuildMatrixProjectName;
   end else if Sender is TLazPackage then begin
     Result:=TLazPackage(Sender).Name;
-  end;
+  end else
+    Result:='#';
   //debugln(['TBuildManager.GetModeMatrixTarget ',DbgSName(Sender),' Target="',Result,'"']);
 end;