Fixes:
- callblock with only
- validation utils in a separate file