Fixes for categories.