oneof init fixes