More category fixes