Fixed a few intermittently-failing specs, should fix WEB-4796