categories fixes