Fixed datasource build issues.