Some fixes from pre-release testing.