Fix drawing errors