Fixed drawing glitches