Mailbox limits, a few bug fixes and cleanups