Another bunch of improvements.
Fixed DoctrineFixtures issues