Martins fixes for eclipse 4.7
4 files changed