Fix up modules