Misc fixes in datasources and Groovy scripts.