Clean-up some warnings
28 files changed