[0.17] Lint fixes