Fixes to update to latest Symfony