category-related bugfixes