Fix collective bugs