Fixes for Categories.