Resolve some warnings in the code
6 files changed