Fix some regressions after moving to multiple lines pr block