Resolved some more potential "timing" issues in specs.