Minor bug fixes (+ happy linter)
Merge branch 'okturtles' into dnschain