Fixing lint/hint warnings.