Fixes for performance tests