Fixes, and remove Symfony