diff --git a/paragon.cabal b/paragon.cabal
--- a/paragon.cabal
+++ b/paragon.cabal
@@ -1,5 +1,5 @@
 Name:                   paragon
-Version:                0.1.11
+Version:                0.1.12
 License:                BSD3
 License-File:           LICENSE
 Author:                 Niklas Broberg
diff --git a/src/Language/Java/Paragon/Parser.hs b/src/Language/Java/Paragon/Parser.hs
--- a/src/Language/Java/Paragon/Parser.hs
+++ b/src/Language/Java/Paragon/Parser.hs
@@ -1282,8 +1282,8 @@
 lockProperties = braces $ LockProperties () <$> optendseplist lclause semiColon
 
 lockExp :: P [Lock ()]
-lockExp = parens (seplist1 lock (tok Comma)) 
-      <|> return . LockVar () <$> ident
+lockExp = parens (seplist1 lock comma) 
+      <|> return <$> lock
 
 
 ------------------------------------------------------------
diff --git a/src/Language/Java/Paragon/TypeCheck/Monad.hs b/src/Language/Java/Paragon/TypeCheck/Monad.hs
--- a/src/Language/Java/Paragon/TypeCheck/Monad.hs
+++ b/src/Language/Java/Paragon/TypeCheck/Monad.hs
@@ -297,6 +297,7 @@
 
 getBranchPC :: Entity -> Tc r TcPolicy
 getBranchPC e = do env <- getEnv
+                   -- debugTc $ "Env: " ++ show env
                    return $ branchPC (Just e) env
 
 getBranchPC_ :: Tc r TcPolicy
diff --git a/src/Language/Java/Paragon/TypeCheck/TcEnv.hs b/src/Language/Java/Paragon/TypeCheck/TcEnv.hs
--- a/src/Language/Java/Paragon/TypeCheck/TcEnv.hs
+++ b/src/Language/Java/Paragon/TypeCheck/TcEnv.hs
@@ -206,6 +206,9 @@
 joinBranchPC p env = let (bm, def) = branchPCE env
                       in env { branchPCE = (Map.map (`join` p) bm, def `join` p) }
 
+--addBranchPCEntity :: Entity -> TcEnv -> TcEnv
+--addBranchPCEntity e env = let (bm, def) = branchPCE env
+--                           in env { branchPCE = (Map.insert e bottom bm, def) }
 --------------------------------------
 --    Working with the lookups      --
 --------------------------------------
@@ -251,4 +254,5 @@
                            Just tm -> tm
                            Nothing -> error $ "lookupTypeOfT: No such type: " ++ show i
               in aux iargs newTm
+-- TODO: Insert array support
 lookupTypeOfT t tm = error $ "lookupTypeOfT: Unexpected type: " ++ show t
diff --git a/src/Language/Java/Paragon/TypeCheck/TcExp.hs b/src/Language/Java/Paragon/TypeCheck/TcExp.hs
--- a/src/Language/Java/Paragon/TypeCheck/TcExp.hs
+++ b/src/Language/Java/Paragon/TypeCheck/TcExp.hs
@@ -118,9 +118,10 @@
   checkM (liftCont $ tyRhs <: tyV) $ 
              "Type mismatch: " ++ prettyPrint tyRhs ++ " <=> " ++ prettyPrint tyV
   -- Check: E[branchPC](n) <= pV
+  -- debugTc $ "entity: " ++ show mEnt
   bpc <- maybe getBranchPC_ getBranchPC mEnt
 
-  --debugTc $ "BPC: " ++ show bpc
+  -- debugTc $ "BPC: " ++ prettyPrint bpc
   constraint_ bpc pV
   -- Check: exnPC(S) <= pV
   epc <- getExnPC
diff --git a/src/Language/Java/Paragon/TypeCheck/TcStmt.hs b/src/Language/Java/Paragon/TypeCheck/TcStmt.hs
--- a/src/Language/Java/Paragon/TypeCheck/TcStmt.hs
+++ b/src/Language/Java/Paragon/TypeCheck/TcStmt.hs
@@ -274,6 +274,7 @@
            then actorIdT <$> newActorId i
            else return tyV
   extendVarEnv i (VSig tyV' pV False fin) $ do
+  addBranchPC (varE (Name () [i])) bottom $ do
     tcLocalVars pV tyV fin vds cont    
 
 -- Rule LOCALVARINIT (Exp)
@@ -287,7 +288,8 @@
             Just aid -> do
               newActorIdWith i aid
               return $ actorIdT aid
-  extendVarEnv i (VSig tyV' pV False fin) $ 
+  extendVarEnv i (VSig tyV' pV False fin) $ do
+  addBranchPC (varE (Name () [i])) bottom $ do
     tcLocalVars pV tyV fin vds cont
 
 -- Rule LOCALVARINIT (Array)