Changes to message sending and fixed a typo in NonPersistant.