Minor improvements to reduce warnings.