Attempt to fix glitches