Fixes based on testing.