Clean up serialization issues