There are more related glitches for which I have fixes. Will test them some more and push in a followup commit.