Nope, not trivial. If you don't want to be touched, tell him. He probably doesn't know. That's your boundaries - tell him in a nice way. That is standing up for yourself. As far as the other, I would def. tell him how it makes you feel, too.