THRIFT-2704 - oneway support more fixes