fixed jsons & latest nighlty core