Fix some warnings.
Fix some more warnings.