Fixes from testing.