CORE: minor changes to receiving messages