fixed issues for performance test