More fixes for getting the config into the DataMapper