More poll fixes.