- Cosmetic changes
- Make collect working when returning from routine