diff --git a/bin/auto b/bin/auto
index d641d5e..26e1af5 100755
--- a/bin/auto
+++ b/bin/auto
@@ -119,7 +119,7 @@ if (defined $ARGV[0]) {
 }
 
 # Check for updates.
-&Lib::Auto::checkver();
+Lib::Auto::checkver();
 
 # Include IPv6 if Auto was built for it.
 if ($ENFEAT =~ /ipv6/) { require IO::Socket::INET6; }
@@ -297,23 +297,23 @@ foreach my $cskey (keys %cservers) {
                 }
             }
         }
-    }           
+    }
 
     # Create the socket.
     if ($use6) {
 	    $SOCKET{$cskey} = IO::Socket::INET6->new(%conndata) or # Or error.
-        err(2, 'Failed to connect to server ('.$ERRNO.'): '.$cskey.' ['.$cservers{$cskey}{'host'}[0].q{:}.$cservers{$cskey}{'port'}[0].']', 0) 
+        err(2, 'Failed to connect to server ('.$ERRNO.'): '.$cskey.' ['.$cservers{$cskey}{'host'}[0].q{:}.$cservers{$cskey}{'port'}[0].']', 0)
         and delete $SOCKET{$cskey} and next;
     }
     else {
         if ($usessl) {
 	        $SOCKET{$cskey} = IO::Socket::SSL->new(%conndata) or # Or error.
-            err(2, 'Failed to connect to server ('.$ERRNO.'): '.$cskey.' ['.$cservers{$cskey}{'host'}[0].q{:}.$cservers{$cskey}{'port'}[0].']', 0) 
+            err(2, 'Failed to connect to server ('.$ERRNO.'): '.$cskey.' ['.$cservers{$cskey}{'host'}[0].q{:}.$cservers{$cskey}{'port'}[0].']', 0)
             and delete $SOCKET{$cskey} and next;
         }
         else {
 	        $SOCKET{$cskey} = IO::Socket::INET->new(%conndata) or # Or error.
-            err(2, 'Failed to connect to server ('.$ERRNO.'): '.$cskey.' ['.$cservers{$cskey}{'host'}[0].q{:}.$cservers{$cskey}{'port'}[0].']', 0) 
+            err(2, 'Failed to connect to server ('.$ERRNO.'): '.$cskey.' ['.$cservers{$cskey}{'host'}[0].q{:}.$cservers{$cskey}{'port'}[0].']', 0)
             and delete $SOCKET{$cskey} and next;
         }
     }
@@ -327,7 +327,7 @@ foreach my $cskey (keys %cservers) {
 	API::Std::event_run('on_preconnect', $cskey);
 	# Send NICK/USER.
 	API::IRC::nick($cskey, $cservers{$cskey}{'nick'}[0]);
-	socksnd($cskey, 'USER '.$cservers{$cskey}{'ident'}[0].' '.hostname.' '.$cservers{$cskey}{'host'}[0].' :'.$cservers{$cskey}{'realname'}[0]) or
+	socksnd($cskey, 'USER '.$cservers{$cskey}{'ident'}[0].q{ }.hostname.q{ }.$cservers{$cskey}{'host'}[0].' :'.$cservers{$cskey}{'realname'}[0]) or
 		err(2, 'Failed to connect to server: '.$cskey.' ['.$cservers{$cskey}{'host'}[0].q{:}.$cservers{$cskey}{'port'}[0].']', 0)
 		and next;
 	# Add to select.