Fix warnings
4 files changed