Small serialization changes