diff --git a/TODO.md b/TODO.md
index 1bca4a87..dde69b63 100644
--- a/TODO.md
+++ b/TODO.md
@@ -15,7 +15,6 @@
 - Make UI strings localizable (e.g. entries in menus, welcome message, etc.)
 - Figure out what causes the corruption message on PC proxy sessions and fix it
 - Enable item tracking in battle/challenge games (everything should already be set up for it to work)
-- Use challenge mode rare tables in challenge mode games (also, apparently it always uses Viridia? verify this)
 - Rewrite REL-based parsers so they don't assume any fixed offsets
 
 ## Episode 3
diff --git a/src/CommonItemSet.cc b/src/CommonItemSet.cc
index a9904376..ba10c842 100644
--- a/src/CommonItemSet.cc
+++ b/src/CommonItemSet.cc
@@ -15,7 +15,7 @@ const CommonItemSet::Table<true>& CommonItemSet::get_table(
       ((mode == GameMode::CHALLENGE) ? "c" : ""),
       ((episode == Episode::EP2) ? "l" : ""),
       tolower(abbreviation_for_difficulty(difficulty)),
-      secid);
+      (mode == GameMode::CHALLENGE) ? 0 : secid);
   auto data = this->gsl.get(filename);
   if (data.second < sizeof(Table<true>)) {
     throw runtime_error(string_printf(
diff --git a/src/Lobby.cc b/src/Lobby.cc
index ab9373f8..6d2d990f 100644
--- a/src/Lobby.cc
+++ b/src/Lobby.cc
@@ -52,7 +52,7 @@ void Lobby::create_item_creator() {
   } else if (this->base_version == GameVersion::GC || this->base_version == GameVersion::XB) {
     rare_item_set = s->rare_item_sets.at("default-v3");
   } else {
-    // TODO: SHould there be a separate table for V1 eventually?
+    // TODO: Should there be a separate table for V1 eventually?
     rare_item_set = s->rare_item_sets.at("default-v2");
   }
   this->item_creator.reset(new ItemCreator(