some updates from nightly fails on multi-machine ec2