Fixing missing data issues