Fix for some more datasource config issues.