Fixed Serialization issues.