Handle many many more inconsistencies in our data source