Update performance-test.json and a couple of fixes