Fixes for line length