Fix missing fields errors.