individual elibility fixes