XD-1787 PR Comments

- minor fixes
- Separate validation for producer and consumer props