Cleanup/Fixes in Categorize.