Eclipse fixes