Adding a few fixes for running on a cluster.