Fix trimmed instance parsing
Add multi-ring recovery