Performance fixups 2/n

9 jobs for performance_pa in 20 minutes and 11 seconds (queued for 3 seconds)