The first one is awful and has blamed me saying my sense of humor lead her to it. She never apologized for mocking me. I no longer tell her anything that would allow it to happen again and I remind her of her failure/incompetence when she tries to be funny or bond with me in any way and ask that she stop it.
The second one has had not real rupture - she can be more or less paying attention -but she is better at stepping aside from the potential rupture so it does not occur. She is better at both apologizing and at not getting into a clash. She is also usually better at reading me - so that probably helps.