misc changes for eastwood linter