Patch from Steven Scholz, fix some warnings
3 files changed