Box2 & Box3 fixes