diff --git a/src/Tetris.hs b/src/Tetris.hs
index 5d91afe..cf84d37 100644
--- a/src/Tetris.hs
+++ b/src/Tetris.hs
@@ -178,7 +178,7 @@ initGame lvl = do
     }
 
 isGameOver :: Game -> Bool
-isGameOver g = blockStopped g && g ^. block ^. origin == startOrigin
+isGameOver g = blockStopped g && g ^. (block . origin) == startOrigin
 
 -- | The main game execution, this is executed at each discrete time step
 timeStep :: MonadIO m => TetrisT m ()
diff --git a/src/UI/Game.hs b/src/UI/Game.hs
index 5750672..802275d 100644
--- a/src/UI/Game.hs
+++ b/src/UI/Game.hs
@@ -134,7 +134,7 @@ handleTick ui =
 -- | Restart game at the same level
 restart :: UI -> EventM Name (Next UI)
 restart ui = do
-  let lvl = ui ^. game ^. level
+  let lvl = ui ^. (game . level)
   g <- liftIO $ initGame lvl
   continue $ ui & game .~ g
                 & locked .~ False
@@ -161,8 +161,8 @@ drawGrid ui =
           foldr (<+>) emptyWidget
             . M.filterWithKey (\(V2 _ y) _ -> r == y)
             $ mconcat
-                [ drawBlockCell NormalBlock <$> ui ^. game ^. board
-                , blockMap NormalBlock (ui ^. game ^. block)
+                [ drawBlockCell NormalBlock <$> ui ^. (game . board)
+                , blockMap NormalBlock (ui ^. (game . block))
                 , case ui ^. preview of
                     Nothing -> M.empty
                     Just s  -> blockMap (HardDropBlock s) (evalTetris hardDroppedBlock (ui ^. game))