Handle EI Issues

Handles several EI reported issues --> "No issues" result