category-related fixes