Fixes for categories
Fixes for categories