Minor changes to .mak files for easier life