#1086 Fixed remaining linter warnings