Fixes to make CDX work with bokeh@master