Small glitch fixes