Slight changes to circumvent some problems on the cluster