More flexible callvote argument counts

Signed-off-by: Gerco van Heerdt <gercovanheerdt@gmail.com>
Wrong variable

Really not paying much attention today. :/

Signed-off-by: Gerco van Heerdt <gercovanheerdt@gmail.com>