Fix JSJSON issues