More handling of weird lines