Fix linters issues after 128 rebase

The rebase introduces a bunch new lint rules 😅

This is blocked until !1043 (merged) is merged though.