diff --git a/Converter/AbstractConverter.php b/Converter/AbstractConverter.php
index 14d1aa0..7a30e52 100644
--- a/Converter/AbstractConverter.php
+++ b/Converter/AbstractConverter.php
@@ -45,7 +45,7 @@ public function apply(Request $request, ParamConverter $configuration)
         }
         elseif($username)
         {
-            $searchArray = array('username' => $username);
+            $searchArray = array('usernameCanonical' => $username);
         }
         elseif($id)
         {
@@ -92,4 +92,4 @@ public function supports(ParamConverter $configuration)
         }
     }
 
-}
\ No newline at end of file
+}
diff --git a/Forms/ArticleType.php b/Forms/ArticleType.php
index 9a73b8e..3af2d4e 100644
--- a/Forms/ArticleType.php
+++ b/Forms/ArticleType.php
@@ -115,7 +115,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                     'query_builder' => function (EntityRepository $er) {
                         return $er->createQueryBuilder('a')
                             ->where('a.roles like :type')
-                            ->orderBy('a.username', 'ASC')
+                            ->orderBy('a.usernameCanonical', 'ASC')
                             ->setParameter('type', '%ROLE_BLOG_USER%');
 
                     },
@@ -208,4 +208,4 @@ public function setDefaultOptions(OptionsResolverInterface $resolver)
     }
 
 
-}
\ No newline at end of file
+}
diff --git a/Resources/public/js/general.js b/Resources/public/js/general.js
index 3113d73..d6f7535 100644
--- a/Resources/public/js/general.js
+++ b/Resources/public/js/general.js
@@ -6,7 +6,8 @@ $(document).ready(function(){
     plugins: [
         "advlist autolink link lists charmap print preview hr anchor pagebreak",
         "searchreplace wordcount visualblocks visualchars insertdatetime media nonbreaking",
-        "table contextmenu directionality emoticons paste textcolor"
+        "table contextmenu directionality emoticons paste textcolor",
+        "code"
     ],
     toolbar1: "undo redo | bold italic underline | alignleft aligncenter alignright alignjustify | bullist numlist outdent indent | styleselect",
     toolbar2: "| link unlink anchor | forecolor backcolor  | print preview code ",
@@ -390,4 +391,4 @@ function initNprogress()
             window.location = data.redirect;
         }
     });
-}
\ No newline at end of file
+}
diff --git a/Security/Authorization/Voter/ArticleVoter.php b/Security/Authorization/Voter/ArticleVoter.php
index b29f997..e55c782 100644
--- a/Security/Authorization/Voter/ArticleVoter.php
+++ b/Security/Authorization/Voter/ArticleVoter.php
@@ -49,6 +49,10 @@ public function supportsClass($class)
         {
             return false;
         }
+        catch(\Error $e)
+        {
+            return false;
+        }
 
     }
 
diff --git a/composer.json b/composer.json
index 25e3097..973919b 100644
--- a/composer.json
+++ b/composer.json
@@ -36,9 +36,9 @@
     "sensio/framework-extra-bundle": "~3.0,>=3.0.2",
     "incenteev/composer-parameter-handler": "~2.0",
     "friendsofsymfony/user-bundle": "*",
-    "sonata-project/media-bundle": "~2.3",
-    "sonata-project/doctrine-orm-admin-bundle": "^2.3",
-    "jms/serializer-bundle": "~0.13",
+    "sonata-project/media-bundle": "3.*",
+    "sonata-project/doctrine-orm-admin-bundle": "3.*",
+    "jms/serializer-bundle": "~1.1",
     "knplabs/knp-paginator-bundle": "*",
     "doctrine/doctrine-fixtures-bundle": "*",
     "stof/doctrine-extensions-bundle": "~1.1@dev",