Remove Symfony 1.0 specifics.
Fix minor bug.