diff --git a/Assets/Scripts/StageStatic.cs b/Assets/Scripts/StageStatic.cs
index 764216d4e086e8936ad4bce8822fb1dd6a4ce2d7..09125627fe26f64fea3af9cf13197f7bd74648ff 100644
--- a/Assets/Scripts/StageStatic.cs
+++ b/Assets/Scripts/StageStatic.cs
@@ -1,6 +1,7 @@
 using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
+using System;
 using UnityEngine;
 
 public static class StageStatic
@@ -50,6 +51,9 @@ public static StageErrorStruct error {
     // TODO! generate at buildtime
     private static List<string> GenerateWorldList()
     {
+
+#if UNITY_EDITOR
+
         _Worlds = new List<string>();
 
         string world = "World";
@@ -67,6 +71,10 @@ private static List<string> GenerateWorldList()
                 }
             }
         }
+#else
+        _Worlds = new List<string> {"TreeWorld", "RiverWorld"};
+        Debug.Log("WorldList might be incomplete or incorrect!");
+#endif
 
         return _Worlds;
     }
diff --git a/Assets/Standard Assets/Utility/AutoMobileShaderSwitch.cs b/Assets/Standard Assets/Utility/AutoMobileShaderSwitch.cs
index e430a2d455510cee4ef301713157d624957ac468..db3c18145b6b6e0263df206e343b33e2f793cb5d 100644
--- a/Assets/Standard Assets/Utility/AutoMobileShaderSwitch.cs	
+++ b/Assets/Standard Assets/Utility/AutoMobileShaderSwitch.cs	
@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using UnityEngine;
 #if UNITY_EDITOR
 using UnityEditor;