Fix up MonoidStore