More lint fixes.
More lint fixes (hard-coded strings).