Fix up glitchiness