Minor cleanup for first test runs.