Location data source bug fixes