Fix some compiler warnings.
Fix some more compiler warnings.