Final cartopy-tephi changes.