Fixes for DataMapperServiceProvider