Fix up categories