Tweaks to better fit the client senders being made