Various adjustments as I proceed with regression tests.