Various changes for cluster runs