some fixes for perf tests