Merge recent Vector2 changes