Applying fixes required to get the mapping collectors working

Fixes #216
Merge pull request #217 from doctrine/hotfix/zdt-collectors

Applying fixes required to get the mapping collectors working