Minor fixes for testing.