Additional glitch fixes