BAP-6748: Fixes after review:
- Voters