Fixes lint regressions from d6b57e8e0218ead