Fix warnings.
Merge