Fix warnings.
More warning fixes.