Fixed line length issues