Initial fix for json serialization issues.