Fix linter issues. r=me