Fixing issues with serialization