Really fix the categories