Lots of 2v2 fixes