Fix linter complaints