diff --git a/bin/unix/evennia.service b/bin/unix/evennia.service
index a312bb8b4e..5b636f202b 100644
--- a/bin/unix/evennia.service
+++ b/bin/unix/evennia.service
@@ -26,6 +26,11 @@ User=your-user
 #
 ExecStart=/your/path/to/pyenv/bin/python /your/path/to/evennia/bin/unix/evennia ipstart --gamedir /your/path/to/mygame
 
+#
+# Service needs to know the path to twistd binary
+# Replace /your/path/to/venv/bin with whatever is appropriate
+Environment="PATH=/your/path/to/pyenv/bin:$PATH"
+
 # restart on all failures, wait 3 seconds before doing so.
 Restart=on-failure
 RestartSec=3
diff --git a/evennia/accounts/accounts.py b/evennia/accounts/accounts.py
index 4cb1255dfa..0d8a9dd09a 100644
--- a/evennia/accounts/accounts.py
+++ b/evennia/accounts/accounts.py
@@ -1500,7 +1500,7 @@ class DefaultAccount(AccountDB, metaclass=TypeclassBase):
                     )
                 )
             result.append("\n\n |whelp|n - more commands")
-            result.append("\n |wooc <Text>|n - talk on public channel")
+            result.append("\n |wpublic <Text>|n - talk on public channel")
 
             charmax = _MAX_NR_CHARACTERS
 
diff --git a/evennia/objects/objects.py b/evennia/objects/objects.py
index 746d02a47a..660dc4de01 100644
--- a/evennia/objects/objects.py
+++ b/evennia/objects/objects.py
@@ -628,7 +628,7 @@ class DefaultObject(ObjectDB, metaclass=TypeclassBase):
                     logger.log_trace()
         kwargs["options"] = options
         try:
-            if not self.at_msg_receive(text=text, **kwargs):
+            if not self.at_msg_receive(text=text, from_obj=from_obj, **kwargs):
                 # if at_msg_receive returns false, we abort message to this object
                 return
         except Exception:
@@ -1443,7 +1443,7 @@ class DefaultObject(ObjectDB, metaclass=TypeclassBase):
             }
         )
 
-        location.msg_contents(string, exclude=(self,), mapping=mapping)
+        location.msg_contents(string, exclude=(self,), from_obj=self, mapping=mapping)
 
     def announce_move_to(self, source_location, msg=None, mapping=None, **kwargs):
         """
@@ -1505,7 +1505,7 @@ class DefaultObject(ObjectDB, metaclass=TypeclassBase):
             }
         )
 
-        destination.msg_contents(string, exclude=(self,), mapping=mapping)
+        destination.msg_contents(string, exclude=(self,), from_obj=self, mapping=mapping)
 
     def at_after_move(self, source_location, **kwargs):
         """