Category repository fixes