Fixed some issues with datasource example