More fixes, mostly working with steal-can-example