Some updates for newer Symfony releases