Fix drawing artifacts