elibility fixes