Fix linters, second try