linter warning fixes (partial)