minor fixes.
Time for one more test run.