Data fixes

This brings in a few changes to our data source.