Fix and revert to Eclipse compiler