Fixes in services.yml