Pull a few fixes from cesium pre-1.2