diff --git a/src/Dodge/Combine/Data.hs b/src/Dodge/Combine/Data.hs
index ce4df33de..66b333251 100644
--- a/src/Dodge/Combine/Data.hs
+++ b/src/Dodge/Combine/Data.hs
@@ -71,7 +71,7 @@ data CombineType
     | BOOSTER
     | REWINDER
     | BLINKER
-    | FORCEFIELD
+    | FORCEFIELDGUN
     | SHRINKER
     -- Equipment
     | RADAR
diff --git a/src/Dodge/Item/Weapon/Utility.hs b/src/Dodge/Item/Weapon/Utility.hs
index c50c8ed07..47d1afda5 100644
--- a/src/Dodge/Item/Weapon/Utility.hs
+++ b/src/Dodge/Item/Weapon/Utility.hs
@@ -129,8 +129,8 @@ autoEffectGun name eff = defaultAutoGun
     }
 forceFieldGun :: Item
 forceFieldGun = defaultGun 
-    { _itName = "FORCEFIELD"
-    , _itType = FORCEFIELD
+    { _itName = "FORCEFIELDGUN"
+    , _itType = FORCEFIELDGUN
     , _itConsumption = defaultAmmo
         { _ammoBaseMax = 100
         , _ammoLoaded = 100
diff --git a/src/Dodge/LockAndKey.hs b/src/Dodge/LockAndKey.hs
index 741b8e120..6f9574423 100644
--- a/src/Dodge/LockAndKey.hs
+++ b/src/Dodge/LockAndKey.hs
@@ -22,14 +22,14 @@ bossKeyItems =
 
 lockRoomKeyItems :: RandomGen g => [ (Int -> State g (LabSubCompTree Room) , State g CombineType ) ]
 lockRoomKeyItems = 
-    [(lasCenSensEdge, takeOne [LAUNCHER,LASGUN,SPARKGUN,FLATSHIELD] )
+    [(lasCenSensEdge, takeOne [LAUNCHER,LASGUN,SPARKGUN,FLATSHIELD,FORCEFIELDGUN] )
     ,(sensorRoomRunPast Electrical, takeOne [STATICMODULE,SPARKGUN] )
     ,(sensorRoomRunPast Flaming, takeOne [FLAMESPITTER, INCENDIARYMODULE] )
     ,(sensorRoomRunPast Lasering, return LASGUN )
     ,(const slowDoorRoomRunPast, return MINIGUN)
     ,(const longRoomRunPast, takeOne [SNIPERRIFLE,FLATSHIELD])
     ,(const glassLessonRunPast, takeOne [LASGUN])
-    ,(const $ lasTunnelRunPast 400, return FLATSHIELD)
+    ,(const $ lasTunnelRunPast 400, takeOne [FLATSHIELD,FORCEFIELDGUN])
     ,(keyCardRoomRunPast 0, return (KEYCARD 0))
     ]
 
@@ -65,6 +65,10 @@ itemRooms =
         [rc [sniperRifle]
         ]
       )
+    , (FORCEFIELDGUN   , join $ takeOne 
+        [rc [forceFieldGun]
+        ]
+      )
     , (KEYCARD 0   , join $ takeOne 
         [rc [keyCard 0]
         ]
diff --git a/src/Dodge/StartNewGame.hs b/src/Dodge/StartNewGame.hs
index c0e4e9539..c8cd141ad 100644
--- a/src/Dodge/StartNewGame.hs
+++ b/src/Dodge/StartNewGame.hs
@@ -7,7 +7,7 @@ import System.Random
 startNewGame :: Universe -> Universe
 startNewGame u = startSeedGame i u
   where
-    i = fst $ random (_randGen (_uvWorld u))
+    i = fst $ randomR (0,maxBound) (_randGen (_uvWorld u))
 
 startSeedGame :: Int -> Universe -> Universe
 startSeedGame i u = u