Fixed visual glitches