#137: fixes to work in eclipse again