Fix voting, mostly