diff --git a/Tapeti/TapetiConfig.cs b/Tapeti/TapetiConfig.cs
index bdc3da7..8f06369 100644
--- a/Tapeti/TapetiConfig.cs
+++ b/Tapeti/TapetiConfig.cs
@@ -174,7 +174,7 @@ namespace Tapeti
 
         public TapetiConfig RegisterAllControllers()
         {
-            return RegisterAllControllers(Assembly.GetCallingAssembly());
+            return RegisterAllControllers(Assembly.GetEntryAssembly());
         }
 
 
diff --git a/Tapeti/TapetiConnection.cs b/Tapeti/TapetiConnection.cs
index 60355ae..e59e1e2 100644
--- a/Tapeti/TapetiConnection.cs
+++ b/Tapeti/TapetiConnection.cs
@@ -34,6 +34,12 @@ namespace Tapeti
         }
 
 
+        public ISubscriber SubscribeSync()
+        {
+            return Subscribe().Result;
+        }
+
+
         public IPublisher GetPublisher()
         {
             return new TapetiPublisher(() => worker.Value);