multiple serialization fixes