Fixes associated with holoviews refactor

This PR is to be evaluated in conjunction with this PR providing a full refactor of the holoviews library. It shouldn't be merged until the holoviews PR has been merged and the repository renamed.