Fix some more rare spec failures.