diff --git a/src/Symfony/Component/HttpKernel/Kernel.php b/src/Symfony/Component/HttpKernel/Kernel.php
index 3b465dc7d5b2..684529e78a98 100644
--- a/src/Symfony/Component/HttpKernel/Kernel.php
+++ b/src/Symfony/Component/HttpKernel/Kernel.php
@@ -423,7 +423,7 @@ public function setClassCache(array $classes)
      */
     public function setAnnotatedClassCache(array $annotatedClasses)
     {
-        file_put_contents(($this->warmupDir ?: $this->getCacheDir()).'/annotations.map', sprintf('<?php return %s;', var_export($annotatedClasses, true)));
+        file_put_contents(($this->warmupDir ?: $this->getCacheDir()).'/annotations.map', sprintf('<?php return %s;', var_export($annotatedClasses, true)), LOCK_EX);
     }
 
     /**
diff --git a/src/Symfony/Component/Workflow/Definition.php b/src/Symfony/Component/Workflow/Definition.php
index 5f8571b329a0..e36640763859 100644
--- a/src/Symfony/Component/Workflow/Definition.php
+++ b/src/Symfony/Component/Workflow/Definition.php
@@ -82,7 +82,7 @@ private function setInitialPlace($place)
 
     private function addPlace($place)
     {
-        if (!preg_match('{^[\w\d_-]+$}', $place)) {
+        if (!preg_match('{^[\w_-]+$}', $place)) {
             throw new InvalidArgumentException(sprintf('The place "%s" contains invalid characters.', $place));
         }
 
diff --git a/src/Symfony/Component/Workflow/DefinitionBuilder.php b/src/Symfony/Component/Workflow/DefinitionBuilder.php
index f663c16d1a25..16d66286efb4 100644
--- a/src/Symfony/Component/Workflow/DefinitionBuilder.php
+++ b/src/Symfony/Component/Workflow/DefinitionBuilder.php
@@ -77,7 +77,7 @@ public function setInitialPlace($place)
      */
     public function addPlace($place)
     {
-        if (!preg_match('{^[\w\d_-]+$}', $place)) {
+        if (!preg_match('{^[\w_-]+$}', $place)) {
             throw new InvalidArgumentException(sprintf('The place "%s" contains invalid characters.', $place));
         }
 
diff --git a/src/Symfony/Component/Workflow/Transition.php b/src/Symfony/Component/Workflow/Transition.php
index fb4786c88a26..f673517f32e6 100644
--- a/src/Symfony/Component/Workflow/Transition.php
+++ b/src/Symfony/Component/Workflow/Transition.php
@@ -30,7 +30,7 @@ class Transition
      */
     public function __construct($name, $froms, $tos)
     {
-        if (!preg_match('{^[\w\d_-]+$}', $name)) {
+        if (!preg_match('{^[\w_-]+$}', $name)) {
             throw new InvalidArgumentException(sprintf('The transition "%s" contains invalid characters.', $name));
         }