Fix client drawing performance