More fixes for addCoordinateSystem deprecation