Avoid compiler warnings.
6 files changed