Partial upgrade to latest Cesium