diff --git a/bot.py b/bot.py
index 1b9a9f2c1f..cce02ceff2 100644
--- a/bot.py
+++ b/bot.py
@@ -237,6 +237,7 @@ async def runner():
                 if self._session:
                     await self._session.close()
 
+        # noinspection PyUnusedLocal
         def stop_loop_on_completion(f):
             loop.stop()
 
@@ -811,7 +812,7 @@ async def is_blocked(
         *,
         channel: discord.TextChannel = None,
         send_message: bool = False,
-    ) -> typing.Tuple[bool, str]:
+    ) -> bool:
 
         member = self.guild.get_member(author.id)
         if member is None:
@@ -892,7 +893,9 @@ async def get_thread_cooldown(self, author: discord.Member):
         return
 
     @staticmethod
-    async def add_reaction(msg, reaction: discord.Reaction) -> bool:
+    async def add_reaction(
+        msg, reaction: typing.Union[discord.Emoji, discord.Reaction, discord.PartialEmoji, str]
+    ) -> bool:
         if reaction != "disable":
             try:
                 await msg.add_reaction(reaction)
diff --git a/core/clients.py b/core/clients.py
index db4e9936b4..f3b2248c67 100644
--- a/core/clients.py
+++ b/core/clients.py
@@ -68,7 +68,7 @@ class GitHub:
     def __init__(self, bot, access_token: str = "", username: str = "", **kwargs):
         self.bot = bot
         self.session = bot.session
-        self.headers: dict = None
+        self.headers: Optional[dict] = None
         self.access_token = access_token
         self.username = username
         self.avatar_url: str = kwargs.pop("avatar_url", "")
@@ -319,7 +319,7 @@ async def get_config(self) -> dict:
     async def update_config(self, data: dict):
         return NotImplemented
 
-    async def edit_message(self, message_id: Union[int, str], new_content: str) -> None:
+    async def edit_message(self, message_id: Union[int, str], new_content: str):
         return NotImplemented
 
     async def append_log(
@@ -359,6 +359,12 @@ async def edit_note(self, message_id: Union[int, str], message: str):
     def get_plugin_partition(self, cog):
         return NotImplemented
 
+    async def update_repository(self) -> dict:
+        return NotImplemented
+
+    async def get_user_info(self) -> Optional[dict]:
+        return NotImplemented
+
 
 class MongoDBClient(ApiClient):
     def __init__(self, bot):
@@ -659,7 +665,7 @@ async def update_repository(self) -> dict:
             "user": {"username": user.username, "avatar_url": user.avatar_url, "url": user.url,},
         }
 
-    async def get_user_info(self) -> dict:
+    async def get_user_info(self) -> Optional[dict]:
         try:
             user = await GitHub.login(self.bot)
         except InvalidConfigError: