Update files to be fully compatible with Symfony 2.2.1