Lint induced fixes.