Fix remaining coordinate system issues