More StringWrapper changes