Transform2D fixes