Minor fixes for performance experiment