Fix serialization registration issues