diff --git a/bsputil/decompile.cpp b/bsputil/decompile.cpp
index e9745c84..0088913e 100644
--- a/bsputil/decompile.cpp
+++ b/bsputil/decompile.cpp
@@ -222,7 +222,7 @@ struct compiled_brush_t
                 side.valve.shift[0], side.valve.axis.at(1, 0), side.valve.axis.at(1, 1), side.valve.axis.at(1, 2),
                 side.valve.shift[1], 0.0, side.valve.scale[0], side.valve.scale[1]);
 
-            if (contents.native || side.flags.native || side.value) {
+            if (bsp->loadversion->game->id == GAME_QUAKE_II && (contents.native || side.flags.native || side.value)) {
                 wal_metadata_t *meta = nullptr;
 
                 auto it = wals.find(side.texture_name);
diff --git a/include/qbsp/qbsp.hh b/include/qbsp/qbsp.hh
index 3d4ccc63..b1a6fab4 100644
--- a/include/qbsp/qbsp.hh
+++ b/include/qbsp/qbsp.hh
@@ -109,15 +109,15 @@ public:
 
     bool parse(const std::string &settingName, parser_base_t &parser, bool locked = false) override
     {
-        if (auto value = parseString(parser)) {
-            if (changeSource(locked ? source::COMMANDLINE : source::MAP)) {
-                _paths.insert(wadpath{fs::path(*value), settingName[0] == 'x'});
-            }
-
-            return true;
+        if (!parser.parse_token()) {
+            return false;
         }
 
-        return false;
+        if (changeSource(locked ? source::COMMANDLINE : source::MAP)) {
+            _paths.insert(wadpath{fs::path(parser.token), settingName[0] == 'x'});
+        }
+
+        return true;
     }
 
     std::string stringValue() const override