Fix glitches 4