Fix up polling so it kinda stops polling