Vote fix and misc.