Minor fixes observeed during testing.