More fixes for missing data.