Fix issues with serialize/unserialize