Gateway messages, typo fixes