Finalise CSRectangle, fix CSMatrix4 header