Various fixes, failure handling, etc.
Prune Catalyst