Minor changes for detected glitches