Fix some warnings.

6 files changed