More vote fixes.