Serialization fixes
Temp commit