A few minor changes for testing.