Some json2ttv2 fixes