Fixed more warnings.
Fixed more warnings.