Applying fixes required to get the mapping collectors working

Fixes #216