More fixes to vote!