Tweaks to makefiles and pbs job scripts