Some v2 fixes again