Fixed up lots of voting-related code