Voting fixes