STS-3599: A couple of small changes before heading out.