more poll fixes