More category fixes.