diff --git a/Doc/Ref/Fig/Makefile b/Doc/Ref/Fig/Makefile
index 018d7b850d79f1025943a863e7e947fa2091c0f6..2f9eefc9a542c5149078ee8414022da079e71e87 100644
--- a/Doc/Ref/Fig/Makefile
+++ b/Doc/Ref/Fig/Makefile
@@ -17,7 +17,7 @@ sqrtrender transitiveDep updateinfo wellformedandvalid xhtmlexample \
 xhtml xml2fo2pdf xml2html xmlattribandjava xmlbase xpath xslconvert xsl_id 
 
 %-0.pdf:../%.fig
-	/ma/goik/workspace/GoikLectures/bin/fig2mpdf -l -m $< #&& touch $*.done
+	../../../../bin/fig2mpdf -l -m $< #&& touch $*.done
 	if [ -e $*.tex ]; then pdflatex $* && rm -f ../$*.pdf && mv $*.pdf ..; fi;
 
 ../%.fig.pdf:../%.fig
@@ -26,7 +26,7 @@ xhtml xml2fo2pdf xml2html xmlattribandjava xmlbase xpath xslconvert xsl_id
 pdf:$(foreach figfile, $(FIGFILES), $(figfile)-0.pdf)  $(foreach figfile, $(FIGFILES), ../$(figfile).fig.pdf)
 
 all:
-	mkdir -p Generate;cd Generate;$(MAKE) -f ../Makefile pdf
+	mkdir -p Generate;cd Generate;export PATH=../../../../bin:${PATH}; $(MAKE) -f ../Makefile pdf # PATH contains additional tools
 
 clean:
 	rm -rf Generate $(foreach figfile, $(FIGFILES), $(figfile).pdf) $(foreach figfile, $(FIGFILES), $(figfile).fig.pdf)
diff --git a/bin/fig2mpdf b/bin/fig2mpdf
index 2822df7a6566feb37d98bacfe6a0eced77dd723b..733d10f2398a8e0e1a27a23a92146c71edd17ac6 100755
--- a/bin/fig2mpdf
+++ b/bin/fig2mpdf
@@ -439,7 +439,8 @@ function fnDoTexFig(szFileNameBase, szFigFile, szRangeList, iPdf,
     szCommand = sprintf("%s -L pstex_p %s -p %s %s %s", cmdFig2dev, szRangeList, szTexInpPref, szFigFile, szTexInp);
   debug("%s\n", szCommand);
   system(szCommand);
-  createModifierCommand=sprintf("/ma/goik/workspace/GoikLectures/bin/createTexModifier.sh %s", szTexCreator);
+  #createModifierCommand=sprintf("/ma/goik/workspace/GoikLectures/bin/createTexModifier.sh %s", szTexCreator);
+  createModifierCommand=sprintf("createTexModifier.sh %s", szTexCreator);
   debug("%s\n",createModifierCommand);
   system(createModifierCommand);
   szCommand = sprintf("./%s", szTexCreator);