Minor improvements to fix warnings.