diff --git a/.golangci.yml b/.golangci.yml
index 1b186c89e..74797538c 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -1,5 +1,6 @@
 run:
   #skip the protobuf generated files
+  skip-dirs-use-default: true
   skip-dirs:
     - pb
     - proto
@@ -12,6 +13,7 @@ linters-settings:
     # report about shadowed variables
     check-shadowing: true
 
+
     # settings per analyzer
     settings:
       printf: # analyzer name, run `go tool vet help` to see all analyzers
@@ -30,10 +32,11 @@ linters-settings:
       - shadow
     disable-all: false
 
-  staticcheck:
-    # Select the Go version to target. The default is '1.13'.
-    go: "1.16"
-    # https://staticcheck.io/docs/options#checks
-    checks: [ "all" ]
-
 
+issues:
+  max-per-linter: 0
+  max-same: 0
+  exclude-use-default: false
+  exclude:
+    -  'declaration of "(err|ctx)" shadows declaration at'
+    -  'typecheck'
diff --git a/roaring/roaring.go b/roaring/roaring.go
index 4fd8a50c0..bc4c57214 100644
--- a/roaring/roaring.go
+++ b/roaring/roaring.go
@@ -2402,13 +2402,13 @@ func (b *Bitmap) ImportRoaringRawIterator(itr RoaringIterator, clear bool, log b
 	}
 	err = nil
 	if log && changed > 0 {
-		op := op{opN: changed, roaring: itr.Data()}
+		o := op{opN: changed, roaring: itr.Data()}
 		if clear {
-			op.typ = opTypeRemoveRoaring
+			o.typ = opTypeRemoveRoaring
 		} else {
-			op.typ = opTypeAddRoaring
+			o.typ = opTypeAddRoaring
 		}
-		err = b.writeOp(&op)
+		err = b.writeOp(&o)
 	}
 	return changed, rowSet, err
 }
@@ -4559,26 +4559,26 @@ func intersectionCallbackRunRun(a, b *Container, fn func(uint16)) {
 			j++
 		} else if va.Last > vb.Last && va.Start >= vb.Start {
 			// |--vb-|-|-va--|
-			for i := int(va.Start); i <= int(vb.Last); i++ {
-				fn(uint16(i))
+			for z := int(va.Start); z <= int(vb.Last); z++ {
+				fn(uint16(z))
 			}
 			j++
 		} else if va.Last > vb.Last && va.Start < vb.Start {
 			// |--va|--vb--|--|
-			for i := int(vb.Start); i <= int(vb.Last); i++ {
-				fn(uint16(i))
+			for z := int(vb.Start); z <= int(vb.Last); z++ {
+				fn(uint16(z))
 			}
 			j++
 		} else if va.Last <= vb.Last && va.Start >= vb.Start {
 			// |--vb|--va--|--|
-			for i := int(va.Start); i <= int(va.Last); i++ {
-				fn(uint16(i))
+			for z := int(va.Start); z <= int(va.Last); z++ {
+				fn(uint16(z))
 			}
 			i++
 		} else if va.Last <= vb.Last && va.Start < vb.Start {
 			// |--va-|-|-vb--|
-			for i := int(vb.Start); i <= int(va.Last); i++ {
-				fn(uint16(i))
+			for z := int(vb.Start); z <= int(va.Last); z++ {
+				fn(uint16(z))
 			}
 			i++
 		}
diff --git a/sql2/walk.go b/sql2/walk.go
index c04ca76ba..30eafd03c 100644
--- a/sql2/walk.go
+++ b/sql2/walk.go
@@ -229,7 +229,7 @@ func walk(v Visitor, node Node) (_ Node, err error) {
 			if src, err := walk(v, n.Source); err != nil {
 				return node, err
 			} else if src != nil {
-				n.Source = n.Source.(Source)
+				n.Source = n.Source
 			} else {
 				n.Source = nil
 			}