Fix issues with changed JSON API