Several bugs encountered running "make test-network" on a fast desktop

Please see branch misc_bugs for fixes. Sorry for brevity of this ticket.

These fixes take my "make test-network" success rate from 0% to about 60%.