More VPOLL related changes - mostly fixes to indexing