eclipse dependency fix + minor fixes