and even moar fixes for mcollective support