Fix remaining validation errors.