poll fixes