Fixes related to the JSON de/serialization