diff --git a/geom-exp.cpp b/geom-exp.cpp
index 6290de43..1caa583e 100644
--- a/geom-exp.cpp
+++ b/geom-exp.cpp
@@ -526,6 +526,7 @@ EX string geometry_name() {
       return XLAT("spherical");
 
     case gcSolNIH:
+#if CAP_SOLV
       switch(solnihv::geom()) {
         case gSol:
           return XLAT("Sol");
@@ -536,6 +537,9 @@ EX string geometry_name() {
         default:
           return "unknown";
         }
+#else
+      return XLAT("Sol");
+#endif
 
     case gcNil:
       return XLAT("Nil");
diff --git a/shmup.cpp b/shmup.cpp
index db7fd0e1..717aa7e9 100644
--- a/shmup.cpp
+++ b/shmup.cpp
@@ -2619,7 +2619,9 @@ EX void turn(int delta) {
         if(havewhat&HF_HEX) movehex_all();
         wandering();
         livecaves();
+        #if CAP_INV
         if(inv::on) inv::compute();
+        #endif
         terracotta();
         heat::processfires();
         if(havewhat&HF_WHIRLPOOL) whirlpool::move();