Fixes for categories