diff --git a/plugins/check_earlytalker b/plugins/check_earlytalker
index f8cd5a1..3d43302 100644
--- a/plugins/check_earlytalker
+++ b/plugins/check_earlytalker
@@ -71,7 +71,7 @@ sub register {
 sub connect_handler {
   my ($self, $transaction) = @_;
   
-  if ($self->argh->can_read($self->{_args}->{'wait'})) {
+  if ($self->qp->can_read($self->{_args}->{'wait'})) {
     $self->log(LOGNOTICE, 'remote host started talking before we said hello');
     if ($self->{_args}->{'defer-reject'}) {
 	$self->connection->notes('earlytalker', 1);
diff --git a/plugins/dnsbl b/plugins/dnsbl
index a89beee..0a708ea 100644
--- a/plugins/dnsbl
+++ b/plugins/dnsbl
@@ -42,7 +42,7 @@ sub connect_handler {
         callback => sub { $self->process_a_result($dnsbl_zones{$dnsbl}, @_) },
         host => "$reversed_ip.$dnsbl",
         type => 'A',
-        client => $self->argh->input_sock,
+        client => $self->qp->input_sock,
       );
     } else {
       $self->log(LOGDEBUG, "Checking $reversed_ip.$dnsbl for TXT record in the background");
@@ -50,7 +50,7 @@ sub connect_handler {
         callback => sub { $self->process_txt_result(@_) },
         host => "$reversed_ip.$dnsbl",
         type => 'TXT',
-        client => $self->argh->input_sock,
+        client => $self->qp->input_sock,
       );
     }
   }
diff --git a/plugins/require_resolvable_fromhost b/plugins/require_resolvable_fromhost
index 48b7a95..007e8bf 100644
--- a/plugins/require_resolvable_fromhost
+++ b/plugins/require_resolvable_fromhost
@@ -30,12 +30,12 @@ sub check_dns {
         callback => sub { $self->dns_result(@_) },
         host => $host,
         type => "MX",
-        client => $self->argh->input_sock,
+        client => $self->qp->input_sock,
     );
     Danga::DNS->new(
         callback => sub { $self->dns_result(@_) },
         host => $host,
-        client => $self->argh->input_sock,
+        client => $self->qp->input_sock,
     );
 }
 
diff --git a/plugins/rhsbl b/plugins/rhsbl
index a5c7f59..96e1dec 100644
--- a/plugins/rhsbl
+++ b/plugins/rhsbl
@@ -30,7 +30,7 @@ sub mail_handler {
         Danga::DNS->new(
           callback => sub { $self->process_result($host, $rhsbl_zones{$rhsbl}, @_) },
           host => "$host.$rhsbl",
-          client => $self->argh->input_sock,
+          client => $self->qp->input_sock,
         );
       }
     }