Attempt at fixing some bizarre polling errors.