Continuing to fix glitches