- Fixed some serialization issues.