Fix compiler warnings
4 files changed