Fix serialization warnings