Class glitches fixed