Fixes to categories