Couple of fixes and compatibility with Symfony 2.3