Fixed more glitches