Fixed some JSON issues