More fixes for wrapped strings