=all some more fixes to make it build in Eclipse