diff --git a/relay/config.py b/relay/config.py
index 71956ed..d2b826c 100644
--- a/relay/config.py
+++ b/relay/config.py
@@ -196,7 +196,7 @@ class RelayConfig(DotDict):
 		options = {}
 
 		try:
-			options['Loader'] = yaml.FullLoader
+			options['Loader'] = yaml.UnsafeLoader
 
 		except AttributeError:
 			pass
diff --git a/relay/http_client.py b/relay/http_client.py
index 4c82fa9..390ed2d 100644
--- a/relay/http_client.py
+++ b/relay/http_client.py
@@ -13,7 +13,9 @@ from . import __version__
 from .misc import (
 	MIMETYPES,
 	DotDict,
-	Message
+	Message,
+	WKNodeinfo,
+	Nodeinfo
 )
 
 
@@ -186,4 +188,4 @@ class HttpClient:
 			logging.verbose(f'Failed to fetch nodeinfo url for domain: {domain}')
 			return False
 
-		return await request(nodeinfo_url, loads=Nodeinfo) or False
+		return await self.get(nodeinfo_url, loads=Nodeinfo) or False
diff --git a/relay/processors.py b/relay/processors.py
index 1af7ed0..15d58a2 100644
--- a/relay/processors.py
+++ b/relay/processors.py
@@ -4,7 +4,7 @@ import logging
 from cachetools import LRUCache
 from uuid import uuid4
 
-from .misc import Message
+from .misc import Message, WKNodeinfo
 
 
 cache = LRUCache(1024)
@@ -23,7 +23,7 @@ async def handle_relay(request):
 	cache[request.message.objectid] = message.id
 	logging.debug(f'>> relay: {message}')
 
-	niboxes = request.database.distill_inboxes(request.message)
+	inboxes = request.database.distill_inboxes(request.message)
 
 	for inbox in inboxes:
 		request.app.push_message(inbox, message)