Small fixes during testing.