Porting further V2 -> V3 changes