Fixes needed because of Cartesian3 changes.