Fixing JSON Serialization issues