Adding a few fixes for running on a cluster.
Merge pull request #92 from fnothaft/fixes-730

Adding a few fixes for running on a cluster.