more lint fixes.