Further fixes for switch to holoviews