Hopefully fix some JSON issues