(*) CTL-567 Minor serialization improvements