Changes to cluster and module load order