fix remaining JSON vars