Bugfixes for cluster runs