Master perftest fixes