Minor changes to get Eclipse clean
7 files changed