Fixes needed for testing.