Performance fixups 4/n

9 jobs for performance_pa in 15 minutes and 53 seconds (queued for 3 seconds)