Deal with serialization issues