some changes to help development on different systems
trying to make Eclipse more happy