Fix more multiline cases