Minor changes to Kaleido to use make_shared