Small JSON fix (but still not all fixed)