Fix more line length issues