Minor changes for testing.