Fixed json parsing issues