Further fixes to SQL datafaile, Fixes #30