Fix eclipse issues