Fixed issues with using an absolute path for data source