mcluster: scl fixes