minor polling fixes