More fixes
fixes for round 2 voting