Some v2 fixes