tweaks to work on more than one machine