Fix more JSON escaping problems...