moar fixes for mcollective support