small fixes to get it running in eclipse