Fixes for the JSON deserializer