Fix serialization issues.