Some glitches fixed