Various adjustments to work with new data.