Continued fixing draw bugs