additional fixes to vote flow