Eiffel Inspector

* Corrected issues found in Eiffel Inspector