Minor fixes from testing.