Small fixes for testing.