Feature/dcom 96 doctrine common abstract factory

Complementary to #506, this PR simply fixes some minor issues with