Fix linter complains