support drawing fixes