#1086 Fixed linter warnings