Eliminate some warnings
some formatting on perf tests