Fixed various category errors