Fix various warnings (#4442)
6 files changed