#1086 Fixed more linter errors