Small fixes to priority mailbox code