Fix categories again