Line wrap fixes