Fixes during testing.