SOAP fixes

These are 2 separate commits because technically they are different issues, but the 55323 test depends on the o_set fix as well.