Fixes for voting