Fixes to mailbox