Minor tweaks.
Fixed warnings.