Lint fixes. Buildbug script fixes.