Fixed issues with JSON deserialization.