diff --git a/docs/simplesamlphp-authsource.md b/docs/simplesamlphp-authsource.md
index 4ffd228ec7fea3b1b0b1659176d6c6dd309b4af3..0734aaa371fa237541809792936ce6edc5274684 100644
--- a/docs/simplesamlphp-authsource.md
+++ b/docs/simplesamlphp-authsource.md
@@ -42,7 +42,7 @@ The only function you need to implement is the `login($username, $password)`-fun
 This function receives the username and password the user entered, and is expected to return the attributes of that user.
 If the username or password is incorrect, it should throw an error saying so:
 
-    throw new \impleSAML\Error\Error('WRONGUSERPASS');
+    throw new \SimpleSAML\Error\Error('WRONGUSERPASS');
 
 "[Implementing custom username/password authentication](./simplesamlphp-customauth)" describes how to implement username/password authentication using that base class.
 
diff --git a/lib/SimpleSAML/Locale/Language.php b/lib/SimpleSAML/Locale/Language.php
index 9e893c113e8ec6593c2269499bf60a8c19a71bf4..015ddf90b2881aa88fe573c077062038c428a1e3 100644
--- a/lib/SimpleSAML/Locale/Language.php
+++ b/lib/SimpleSAML/Locale/Language.php
@@ -230,7 +230,7 @@ class Language
         }
 
         // language is provided in a stored cookie
-        $languageCookie = Language::getLanguageCookie();
+        $languageCookie = self::getLanguageCookie();
         if ($languageCookie !== null) {
             $this->language = $languageCookie;
             return $languageCookie;
diff --git a/lib/SimpleSAML/XHTML/Template.php b/lib/SimpleSAML/XHTML/Template.php
index 49a221569b31e1f3f668f38d5b7acc18d65906a1..30e348872b69270f6908fdf1c95ea8d9e4cca32c 100644
--- a/lib/SimpleSAML/XHTML/Template.php
+++ b/lib/SimpleSAML/XHTML/Template.php
@@ -305,7 +305,7 @@ class Template
     /**
      * Get the template directory of a module, if it exists.
      *
-     * @return string The templates directory of a module.
+     * @return string The templates directory of a module
      *
      * @throws \InvalidArgumentException If the module is not enabled or it has no templates directory.
      */