Fix various category things.