Patch 4 Symfony 2.2+ adjustments