Bug fixes for categories in question