Marker Training
Learning marker training will help big time with these issues! I use “YES” as a marker. YES means you did the right thing, and some sort of reward is coming. There are two things you need to be focused on.

It’s YES, PAUSE, then..REWARD.
If you say yes as your hand is moving the dog just becomes more focused on hand (aka treat) movements.