Minor changes resulting from testing.