Fixed some JSON problems