diff --git a/app/listeners/AclListener.php b/app/listeners/AclListener.php
index c1ed26b..d898e52 100644
--- a/app/listeners/AclListener.php
+++ b/app/listeners/AclListener.php
@@ -10,7 +10,7 @@ use Httpcb\Acl;
 
 class AclListener extends Plugin
 {
-    public function beforeExecuteRoute(Event $event, Dispatcher $dispatcher)
+    public function beforeExecuteRoute(Event $event, Dispatcher $dispatcher) : bool
     {
         // We only have two roles for now, authenticated users and guests.
         if ($this->auth->hasIdentity()) {
@@ -47,5 +47,7 @@ class AclListener extends Plugin
             // Return false to stop the dispatch loop.
             return false;
         }
+
+        return true;
     }
 }
diff --git a/app/models/Data/User.php b/app/models/Data/User.php
index be42c2c..f679c3b 100644
--- a/app/models/Data/User.php
+++ b/app/models/Data/User.php
@@ -255,7 +255,7 @@ class User extends Model
      * Find the first user by Username or Email
      *
      * @param string $value
-     * @return User|bool
+     * @return \Phalcon\Mvc\Model
      */
     static public function findFirstByUsernameOrEmail($value)
     {