Updates to cluster scripts