Fixes for receiving messages on disconnected