More bug fixes
Rm pouch2