Minor tweaks for troubleshooting on beowulf