Fix some more warnings.
5 files changed