Corrected some Eclipse "side-effects"