Fixing up collective modules