Fixed datasource and connection issues