- fix issue with manual statements check
- fix issues with collective transfers