Make the MakeMakefile script a bit more robust