Pre-merge nits

26 jobs for set-sndbuf in 8 minutes and 5 seconds (queued for 5 seconds)