Several fixes to bring Snaps clean in Eclipse
12 files changed