More lint fixes.
More lint fixes.