diff --git a/lib/SimpleSAML/Utils/Auth.php b/lib/SimpleSAML/Utils/Auth.php
index 089f94ea653d2e4953069e7273374db48172f17c..84508206e264dbaaccee7a72be2e214c4a874c19 100644
--- a/lib/SimpleSAML/Utils/Auth.php
+++ b/lib/SimpleSAML/Utils/Auth.php
@@ -1,6 +1,8 @@
 <?php
 namespace SimpleSAML\Utils;
 
+use SimpleSAML\Module;
+
 /**
  * Auth-related utility methods.
  *
@@ -24,10 +26,10 @@ class Auth
         }
 
         if ($returnTo === null) {
-            $returnTo = \SimpleSAML\Utils\HTTP::getSelfURL();
+            $returnTo = HTTP::getSelfURL();
         }
 
-        return \SimpleSAML_Module::getModuleURL('core/login-admin.php', array('ReturnTo' => $returnTo));
+        return Module::getModuleURL('core/login-admin.php', array('ReturnTo' => $returnTo));
     }
 
     /**
diff --git a/lib/SimpleSAML/Utils/XML.php b/lib/SimpleSAML/Utils/XML.php
index 938ce6fd7abe748e55fcf6f769844ae7a6d37d35..13b5123b5230c06fb88576e8d6ec382745375e3a 100644
--- a/lib/SimpleSAML/Utils/XML.php
+++ b/lib/SimpleSAML/Utils/XML.php
@@ -7,7 +7,7 @@
 
 namespace SimpleSAML\Utils;
 
-
+use SimpleSAML\Logger;
 use Symfony\Component\Config\Definition\Exception\Exception;
 
 class XML
@@ -59,7 +59,7 @@ class XML
                 $result = self::isValid($message, 'saml-schema-metadata-2.0.xsd');
         }
         if ($result !== true) {
-            \SimpleSAML_Logger::warning($result);
+            Logger::warning($result);
         }
     }
 
@@ -97,16 +97,16 @@ class XML
 
         switch ($type) {
             case 'in':
-                \SimpleSAML_Logger::debug('Received message:');
+                Logger::debug('Received message:');
                 break;
             case 'out':
-                \SimpleSAML_Logger::debug('Sending message:');
+                Logger::debug('Sending message:');
                 break;
             case 'decrypt':
-                \SimpleSAML_Logger::debug('Decrypted message:');
+                Logger::debug('Decrypted message:');
                 break;
             case 'encrypt':
-                \SimpleSAML_Logger::debug('Encrypted message:');
+                Logger::debug('Encrypted message:');
                 break;
             default:
                 assert(false);
@@ -114,7 +114,7 @@ class XML
 
         $str = self::formatXMLString($message);
         foreach (explode("\n", $str) as $line) {
-            \SimpleSAML_Logger::debug($line);
+            Logger::debug($line);
         }
     }