Merge in fixes from v3 testing.