Minor fixes based on testing.