MODE-2304: Fix glitches