Fixing some stuff for multiple clustered runs