Code fixes to reduce warnings.