Fixed line wrap issues