Merge "Lint tweaks"