Fixes that handle missing data better