More NJSON Fixing