Just some quick changes to fix missing data.