Minor changes to help testing.