Some compatibility changes towards Symfony 2.3